Commit 8dedfba32a664fd6bfd2cbd48166a1b9ea04119b

Authored by Brad Shuttleworth
1 parent 9ae1633b

- archival copy mentioned deletion, which was wrong and confusing.

- restoration of archived docs & deletion ops had unmet dependencies.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4596 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/ktcore/admin/archivedDocuments.php
@@ -9,6 +9,8 @@ require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc'); @@ -9,6 +9,8 @@ require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc');
9 require_once(KT_LIB_DIR . "/widgets/fieldWidgets.php"); 9 require_once(KT_LIB_DIR . "/widgets/fieldWidgets.php");
10 require_once(KT_LIB_DIR . "/templating/kt3template.inc.php"); 10 require_once(KT_LIB_DIR . "/templating/kt3template.inc.php");
11 11
  12 +require_once(KT_LIB_DIR . "/documentmanagement/PhysicalDocumentManager.inc");
  13 +
12 // FIXME chain in a notification alert for un-archival requests. 14 // FIXME chain in a notification alert for un-archival requests.
13 15
14 class ArchivedDocumentsDispatcher extends KTAdminDispatcher { 16 class ArchivedDocumentsDispatcher extends KTAdminDispatcher {
plugins/ktcore/admin/deletedDocuments.php
@@ -9,6 +9,8 @@ require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc'); @@ -9,6 +9,8 @@ require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc');
9 require_once(KT_LIB_DIR . "/widgets/fieldWidgets.php"); 9 require_once(KT_LIB_DIR . "/widgets/fieldWidgets.php");
10 require_once(KT_LIB_DIR . "/templating/kt3template.inc.php"); 10 require_once(KT_LIB_DIR . "/templating/kt3template.inc.php");
11 11
  12 +require_once(KT_LIB_DIR . "/documentmanagement/PhysicalDocumentManager.inc");
  13 +
12 class DeletedDocumentsDispatcher extends KTAdminDispatcher { 14 class DeletedDocumentsDispatcher extends KTAdminDispatcher {
13 function do_main () { 15 function do_main () {
14 $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Deleted Documents')); 16 $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Deleted Documents'));
templates/ktcore/document/admin/archivedlist.smarty
@@ -37,7 +37,7 @@ with LIVE turned off.)</p></div> @@ -37,7 +37,7 @@ with LIVE turned off.)</p></div>
37 </tbody> 37 </tbody>
38 </table> 38 </table>
39 <div class="form_actions"> 39 <div class="form_actions">
40 - <input type="submit" value="{i18n}Expunge{/i18n}" /> 40 + <input type="submit" value="{i18n}Restore from Archive{/i18n}" />
41 <!-- <input type="submit" value="Restore" /> --> <!-- how do we want to handle restore in this? major UI issue :( --> 41 <!-- <input type="submit" value="Restore" /> --> <!-- how do we want to handle restore in this? major UI issue :( -->
42 </div> 42 </div>
43 </form> 43 </form>