Commit d77e8dcea91c0b08f289cb1113f6dc7bdb3399f3
1 parent
b80bb54a
fix and improvements for KTS-69
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4587 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
3 changed files
with
5 additions
and
4 deletions
plugins/ktcore/KTDocumentActions.php
| ... | ... | @@ -574,7 +574,8 @@ class KTDocumentArchiveAction extends KTDocumentAction { |
| 574 | 574 | } |
| 575 | 575 | } |
| 576 | 576 | |
| 577 | - controllerRedirect('viewDocument', 'fDocumentId=' . $this->oDocument->getId()); | |
| 577 | + $_SESSION['KTInfoMessage'][] = _("Document archived."); | |
| 578 | + controllerRedirect('browse', 'fFolderId=' . $this->oDocument->getFolderID()); | |
| 578 | 579 | exit(0); |
| 579 | 580 | } |
| 580 | 581 | } | ... | ... |
plugins/ktstandard/KTSubscriptions.php
| ... | ... | @@ -228,7 +228,7 @@ class KTArchiveSubscriptionTrigger { |
| 228 | 228 | // fire subscription alerts for the checked in document |
| 229 | 229 | $oSubscriptionEvent = new SubscriptionEvent(); |
| 230 | 230 | $oFolder = Folder::get($oDocument->getFolderID()); |
| 231 | - $oSubscriptionEvent->ArchiveDocument($oDocument, $oFolder); | |
| 231 | + $oSubscriptionEvent->ArchivedDocument($oDocument, $oFolder); | |
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | // }}} | ... | ... |
templates/ktcore/action/archive.smarty
| ... | ... | @@ -11,14 +11,14 @@ archive</a>.{/i18n}</p> |
| 11 | 11 | |
| 12 | 12 | <form method="POST" action="{$smarty.server.PHP_SELF}"> |
| 13 | 13 | <fieldset><legend>{i18n}Archive{/i18n}</legend> |
| 14 | -<input type="hidden" name="action" value="move" /> | |
| 14 | +<input type="hidden" name="action" value="archive" /> | |
| 15 | 15 | <input type="hidden" name="fDocumentId" value="{$iDocumentId}" /> |
| 16 | 16 | {foreach from=$fields item=oWidget } |
| 17 | 17 | {$oWidget->render()} |
| 18 | 18 | {/foreach} |
| 19 | 19 | |
| 20 | 20 | <div class="form_actions"> |
| 21 | -<input type="submit" name="submit[move]" value="{i18n}Move{/i18n}" /> | |
| 21 | +<input type="submit" name="submit[archive]" value="{i18n}Archive{/i18n}" /> | |
| 22 | 22 | <input type="submit" name="submit[cancel]" value="{i18n}Cancel{/i18n}" /> |
| 23 | 23 | </div> |
| 24 | 24 | </fieldset> | ... | ... |