diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
index 71582be..1f9a355 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
@@ -51,6 +51,7 @@ require_once("$default->fileSystemRoot/lib/web/WebDocument.inc");
require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc");
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc");
require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc");
require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc");
require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
@@ -259,9 +260,15 @@ if (checkSession()) {
$oPatternCustom->setHtml(getViewPage($oDocument));
}
} else if ($oDocument->isArchived()) {
- // cancel
- $oPatternCustom->setHtml("getFolderID()) . "\">
graphicsUrl/widgets/back.gif\" border=\"0\" />\n");
$main->setErrorMessage("This document has been archived.");
+
+ // allow admins to restore the document
+ if (Permission::userIsSystemAdministrator() || Permission::userIsUnitAdministrator()) {
+ $oPatternCustom->setHtml(getRestoreArchivedDocumentPage($oDocument));
+ } else {
+ // and ordinary users to request that the document be restored
+ $oPatternCustom->setHtml(getRequestRestoreDocumentPage($oDocument));
+ }
}
$main->setCentralPayload($oPatternCustom);
$main->setFormAction("$default->rootUrl/control.php?action=modifyDocument&fDocumentID=" . $oDocument->getID());
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
index 92530f0..d9d9448 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
@@ -234,7 +234,7 @@ function getEditPage($oDocument) {
$sToRender .= "
\n";
$sToRender .= "\t\n";
- $sToRender .= "\t\n";
+ $sToRender .= "\t \n";
$sToRender .= "\t\t| " . renderDocumentData($oDocument) . " | \n";
$sToRender .= "\t \n";
$sToRender .= "\t\n";
@@ -344,7 +344,7 @@ function getViewPage($oDocument) {
$sToRender .= " \n";
$sToRender .= "\n";
$sToRender .= "\t\n";
- $sToRender .= "\t\n";
+ $sToRender .= "\t \n";
$sToRender .= "\t\t| " . renderDocumentData($oDocument) . " | \n";
$sToRender .= "\t \n";
$sToRender .= "\t\n";
@@ -395,7 +395,7 @@ function getCheckOutEditPage($oDocument, $bCheckedOut = false) {
$sToRender .= " \n";
$sToRender .= "\n";
$sToRender .= "\t\n";
- $sToRender .= "\t\n";
+ $sToRender .= "\t \n";
$sToRender .= "\t\t| " . renderDocumentData($oDocument) . " | \n";
$sToRender .= "\t \n";
$sToRender .= "\t\n";
@@ -443,7 +443,7 @@ function getCheckInEditPage($oDocument) {
$sToRender .= " \n";
$sToRender .= "\n";
$sToRender .= "\t\n";
- $sToRender .= "\t\n";
+ $sToRender .= "\t \n";
$sToRender .= "\t\t| " . renderDocumentData($oDocument) . " | \n";
$sToRender .= "\t \n";
$sToRender .= "\t\n";
@@ -480,7 +480,7 @@ function getWebPublishPage($oDocument) {
$sToRender .= " \n";
$sToRender .= "\n";
$sToRender .= "\t\n";
- $sToRender .= "\t\n";
+ $sToRender .= "\t \n";
$sToRender .= "\t\t| " . renderDocumentData($oDocument) . " | \n";
$sToRender .= "\t \n";
$sToRender .= "\t\n";
@@ -522,8 +522,10 @@ function getWebPublishPage($oDocument) {
return $sToRender;
}
+/**
+ * Wraps html in a bordered table
+ */
function wrapInTable($sHtml) {
return "\n\t\t\t\n";
}
-
-?>
+?>
\ No newline at end of file
| | | | |