\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php
index 86023b5..7a8de25 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php
@@ -42,8 +42,6 @@ if (checkSession()) {
require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc");
require_once("$default->fileSystemRoot/lib/roles/Role.inc");
require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php
index 57325b7..ebe0bd6 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php
@@ -31,7 +31,6 @@ require_once("../../../../config/dmsDefaults.php");
KTUtil::extractGPC('fDeleteConfirmed', 'fDocumentIDs', 'fRememberDocumentID');
require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc");
require_once("$default->fileSystemRoot/lib/users/User.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
@@ -47,58 +46,53 @@ require_once("deleteDocumentUI.inc");
$aNondeletedDocs = array();
-if (checkSession()) {
-
- if (isset($fRememberDocumentID)) {
- $fDocumentIDs = $_SESSION['documents'][$fRememberDocumentID];
- } else {
- $sUniqueID = KTUtil::randomString();
- $_SESSION["documents"][$sUniqueID] = $fDocumentIDs;
- $fRememberDocumentID = $sUniqueID;
- }
-
- if (isset($fDocumentIDs)) {
-
- // Check permission and collaboration for all documents
- for ($i = 0; $i < count($fDocumentIDs); $i++) {
-
- $oDocument = Document::get($fDocumentIDs[$i]);
- if (!Permission::userHasDocumentWritePermission($oDocument)) {
-
- // user does not have permission to delete the document
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(renderErrorPage(_("You do not have, at least, permission to delete one document") . ": " .
- $oDocument->getName() . "
" . _("Please deselect it and retry.")));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- return;
-
- } else {
-
- // check if there is collaboration for this document
- $aFolderUserRoles = FolderUserRole::getList(array("document_id = ?", $fDocumentIDs[$i]));/*ok*/
- // check if any of them are active
- $bActive = false;
- for ($j=0; $jlog->info("delDoc bActive=" . ($bActive ? "1" : "0") . ";folderUserRoleID=" . $aFolderUserRoles[$j]->getGroupFolderApprovalID() . "; active=" . ($aFolderUserRoles[$j]->getActive() ? "1" : "0"));
- $bActive = $bActive || $aFolderUserRoles[$j]->getActive();
- }
-
- if ($bActive) {
-
- // there are active collaboration roles for this doc
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(renderErrorPage(_("You can't, at least, delete one document") . ": " .
- $oDocument->getName() . "
" . _("It's still in collaboration")));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- return;
- }
- }
+if (!checkSession()) {
+ die();
+}
+
+if (isset($fRememberDocumentID)) {
+ $fDocumentIDs = $_SESSION['documents'][$fRememberDocumentID];
+} else {
+ $sUniqueID = KTUtil::randomString();
+ $_SESSION["documents"][$sUniqueID] = $fDocumentIDs;
+ $fRememberDocumentID = $sUniqueID;
+}
+
+if (!isset($fDocumentIDs)) {
+ //no document selected for deletion
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ $oPatternCustom = & new PatternCustom();
+ $oPatternCustom->setHtml(renderErrorPage(_("No document currently selected")));
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+ exit(0);
+}
+
+
+// Check permission and collaboration for all documents
+for ($i = 0; $i < count($fDocumentIDs); $i++) {
+ $oDocument = Document::get($fDocumentIDs[$i]);
+
+ if (!Permission::userHasDocumentWritePermission($oDocument)) {
+ // user does not have permission to delete the document
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ $oPatternCustom = & new PatternCustom();
+ $oPatternCustom->setHtml(renderErrorPage(_("You do not have, at least, permission to delete one document") . ": " .
+ $oDocument->getName() . "
" . _("Please deselect it and retry.")));
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+ exit(0);
}
+}
+if (!isset($fDeleteConfirmed)) {
+ //get confirmation first
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ $oPatternCustom = & new PatternCustom();
+ $oPatternCustom->addHtml(getPage($fRememberDocumentID));
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+}
/* Delete all files
If an error occured while deleting a file, then:
@@ -111,127 +105,97 @@ if (checkSession()) {
- if is not empty then show the nondeleted files list
*/
- // Delete all files with possible rollback
- if (isset($fDeleteConfirmed)) {
-
- // deletion of all documents are confirmed
- for ($i = 0; $i < count($fDocumentIDs); $i++) {
-
- $oDocument = Document::get($fDocumentIDs[$i]);
- if (isset($oDocument)) {
- // New transaction
- $sDocumentPath = Folder::getFolderPath($oDocument->getFolderID()) . $oDocument->getFileName();
- $oDocumentTransaction = & new DocumentTransaction($fDocumentIDs[$i], "Document deleted", DELETE);
- $oDocumentTransaction->create();
-
- // flip the status id
- $oDocument->setStatusID(DELETED);
-
- // store
- if ($oDocument->update()) {
- // now move the document to the delete folder
- if (PhysicalDocumentManager::delete($oDocument)) {
- // successfully deleted the document
- $default->log->info("deleteDocumentBL.php successfully deleted document " .
- $oDocument->getFileName() . " from folder " .
- Folder::getFolderPath($oDocument->getFolderID()) .
- " id=" . $oDocument->getFolderID());
-
- // delete all collaboration roles
- for ($j=0; $jlog->info("delDoc deleting folderuserroleID=" . $aFolderUserRoles[$j]->getGroupFolderApprovalID());
- $aFolderUserRoles[$j]->delete();
- }
-
- // fire subscription alerts for the deleted document
- $count = SubscriptionEngine::fireSubscription($fDocumentIDs[$i],
- SubscriptionConstants::subscriptionAlertType("RemoveSubscribedDocument"),
- SubscriptionConstants::subscriptionType("DocumentSubscription"),
- array( "folderID" => $oDocument->getFolderID(),
- "removedDocumentName" => $oDocument->getName(),
- "folderName" => Folder::getFolderDisplayPath($oDocument->getFolderID())));
- $default->log->info("deleteDocumentBL.php fired $count subscription alerts for removed document " . $oDocument->getName());
-
- // remove all document subscriptions for this document
- if (SubscriptionManager::removeSubscriptions($fDocumentIDs[$i], SubscriptionConstants::subscriptionType("DocumentSubscription"))) {
- $default->log->info("deleteDocumentBL.php removed all subscriptions for this document");
- } else {
- $default->log->error("deleteDocumentBL.php couldn't remove document subscriptions");
- }
-
- } else {
- //could not delete the document from the file system
- $default->log->error("deleteDocumentBL.php Filesystem error deleting document " . $oDocument->getFileName() . " from folder " . Folder::getFolderPath($oDocument->getFolderID()) . " id=" . $oDocument->getFolderID());
- //reverse the document deletion
- $oDocument->setStatusID(LIVE);
- $oDocument->update();
- //get rid of the document transaction
- $oDocumentTransaction->delete();
-
- // Store the doc with problem
- array_push($aNondeletedDocs, array($oDocument, _("Could not delete document on file system")));
-
- }
- } else {
- //could not update the documents status in the db
- $default->log->error("deleteDocumentBL.php DB error deleting document " . $oDocument->getFileName() . " from folder " . Folder::getFolderPath($oDocument->getFolderID()) . " id=" . $oDocument->getFolderID());
+for ($i = 0; $i < count($fDocumentIDs); $i++) {
+ $oDocument = Document::get($fDocumentIDs[$i]);
+ if (isset($oDocument)) {
+ // Store the doc with problem
+ array_push($aNondeletedDocs, array($oDocument, _("Could not load document in database")));
+ }
+
+ // New transaction
+ $sDocumentPath = Folder::getFolderPath($oDocument->getFolderID()) . $oDocument->getFileName();
+ $oDocumentTransaction = & new DocumentTransaction($fDocumentIDs[$i], "Document deleted", DELETE);
+ $oDocumentTransaction->create();
+
+ // flip the status id
+ $oDocument->setStatusID(DELETED);
+
+ // store
+ if ($oDocument->update()) {
+ //could not update the documents status in the db
+ $default->log->error("deleteDocumentBL.php DB error deleting document " .
+ $oDocument->getFileName() . " from folder " .
+ Folder::getFolderPath($oDocument->getFolderID()) .
+ " id=" . $oDocument->getFolderID());
+
+ //get rid of the document transaction
+ $oDocumentTransaction->delete();
+
+ // Store the doc with problem
+ array_push($aNondeletedDocs, array($oDocument,
+ _("Could not update document in database")));
+ }
+
+ // now move the document to the delete folder
+ if (PhysicalDocumentManager::delete($oDocument)) {
+ //could not delete the document from the file system
+ $default->log->error("deleteDocumentBL.php Filesystem error deleting document " .
+ $oDocument->getFileName() . " from folder " .
+ Folder::getFolderPath($oDocument->getFolderID()) .
+ " id=" . $oDocument->getFolderID());
+ //reverse the document deletion
+ $oDocument->setStatusID(LIVE);
+ $oDocument->update();
+ //get rid of the document transaction
+ $oDocumentTransaction->delete();
+
+ // Store the doc with problem
+ array_push($aNondeletedDocs, array($oDocument, _("Could not delete document on file system")));
+ }
+
+ // successfully deleted the document
+ $default->log->info("deleteDocumentBL.php successfully deleted document " .
+ $oDocument->getFileName() . " from folder " .
+ Folder::getFolderPath($oDocument->getFolderID()) .
+ " id=" . $oDocument->getFolderID());
+
+ // fire subscription alerts for the deleted document
+ $count = SubscriptionEngine::fireSubscription($fDocumentIDs[$i],
+ SubscriptionConstants::subscriptionAlertType("RemoveSubscribedDocument"),
+ SubscriptionConstants::subscriptionType("DocumentSubscription"),
+ array(
+ "folderID" => $oDocument->getFolderID(),
+ "removedDocumentName" => $oDocument->getName(),
+ "folderName" => Folder::getFolderDisplayPath($oDocument->getFolderID()),
+ ));
+ $default->log->info("deleteDocumentBL.php fired $count subscription alerts for removed document " . $oDocument->getName());
- //get rid of the document transaction
- $oDocumentTransaction->delete();
-
- // Store the doc with problem
- array_push($aNondeletedDocs, array($oDocument, _("Could not update document in database")));
-
- }
- } else {
- //could not load document object
-
- // Store the doc with problem
- array_push($aNondeletedDocs, array($oDocument, _("Could not load document in database")));
-
- }
- }
-
- // List nondeleted documents
- if (!empty($aNondeletedDocs) ) {
-
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
-
- $sError = _("An error occured deleting the following document(s):") . "
";
- foreach ($aNondeletedDocs as $oDoc) {
- $sError .= $oDoc[0]->getDisplayPath() . ": " .$oDoc[1] . "
";
- }
- $sError .= "
" . _("The other documents are been deleted.");
-
- $oPatternCustom->addHtml(renderErrorPage($sError));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
-
- reset($aNondeletedDocs);
-
- } else {
- // redirect to the browse folder page
- redirect("$default->rootUrl/control.php?action=browse&fFolderID=" . $oDocument->getFolderID());
- }
-
-
- } else {
- //get confirmation first
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->addHtml(getPage($fRememberDocumentID));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- }
- } else {
- //no document selected for deletion
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(renderErrorPage(_("No document currently selected")));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- }
+ // remove all document subscriptions for this document
+ if (SubscriptionManager::removeSubscriptions($fDocumentIDs[$i], SubscriptionConstants::subscriptionType("DocumentSubscription"))) {
+ $default->log->info("deleteDocumentBL.php removed all subscriptions for this document");
+ } else {
+ $default->log->error("deleteDocumentBL.php couldn't remove document subscriptions");
+ }
+}
+
+// List nondeleted documents
+if (!empty($aNondeletedDocs) ) {
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ $oPatternCustom = & new PatternCustom();
+
+ $sError = _("An error occured deleting the following document(s):") . "
";
+ foreach ($aNondeletedDocs as $oDoc) {
+ $sError .= $oDoc[0]->getDisplayPath() . ": " .$oDoc[1] . "
";
+ }
+ $sError .= "
" . _("The other documents are been deleted.");
+
+ $oPatternCustom->addHtml(renderErrorPage($sError));
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+ exit(0);
}
+// redirect to the browse folder page
+redirect("$default->rootUrl/control.php?action=browse&fFolderID=" . $oDocument->getFolderID());
+exit(0);
?>
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
index 2612290..902af17 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
@@ -11,7 +11,6 @@ require_once(KT_LIB_DIR . '/dispatcher.inc.php');
require_once(KT_LIB_DIR . '/documentmanagement/Document.inc');
require_once(KT_LIB_DIR . '/foldermanagement/Folder.inc');
-require_once(KT_LIB_DIR . '/documentmanagement/DependantDocumentInstance.inc');
require_once(KT_LIB_DIR . '/documentmanagement/DocumentLink.inc');
require_once(KT_LIB_DIR . '/documentmanagement/documentutil.inc.php');
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php
index 480a51d..2b665a9 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php
@@ -7,7 +7,6 @@ KTUtil::extractGPC('fUploadUrl', 'fUploaded', 'fWebDocumentID');
require_once("$default->fileSystemRoot/lib/email/Email.inc");
require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
-require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc");
require_once("$default->fileSystemRoot/lib/web/WebDocument.inc");
require_once("$default->fileSystemRoot/lib/web/WebSite.inc");
require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
index 4937687..50b090c 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
@@ -31,7 +31,6 @@ require_once("../../../../config/dmsDefaults.php");
KTUtil::extractGPC('fDeleteConfirmed', 'fFolderID');
require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
require_once("$default->fileSystemRoot/lib/foldermanagement/FolderDocTypeLink.inc");
require_once("$default->fileSystemRoot/lib/foldermanagement/PhysicalFolderManagement.inc");
require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc");
@@ -63,12 +62,6 @@ if (checkSession()) {
// successfully deleted the folder from the file system
$default->log->info("deleteFolderBL.php successfully deleted folder " . $oFolder->getName() . " from parent folder " . Folder::getFolderPath($oFolder->getParentID()) . " id=" . $oFolder->getParentID());
- // delete folder collaboration entries
- $aFolderCollaboration = FolderCollaboration::getList(array("folder_id = ?", $fFolderID));/*ok*/
- for ($i=0; $idelete();
- }
-
// delete folder document types link
$aFolderDocTypeLink = FolderDocTypeLink::getList(array("folder_id = ?", $fFolderID));/*ok*/
for ($i=0; $isetHtml(getStatusPage($fFolderID, _("You cannot edit this folder collaboration process as a document is currently undergoing this collaboration process")));
-
- $main->setHasRequiredFields(true);
- $_SESSION["pageAccess"][$default->rootUrl . '/presentation/lookAndFeel/knowledgeTree/store.php'] = true;
- $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID"));
-} else if (isset($fCollaborationDelete)) {
- //user attempted to delete the folder collaboration process but could not because there is
- //a document currently in this process
- $oPatternCustom->setHtml(getStatusPage($fFolderID, _("You cannot delete this folder collaboration process as a document is currently undergoing this collaboration process")));
- $main->setHasRequiredFields(true);
- $_SESSION["pageAccess"][$default->rootUrl . '/presentation/lookAndFeel/knowledgeTree/store.php'] = true;
- $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID"));
-} else {
- // does this folder have a document in it that has started collaboration?
- $bCollaboration = Folder::hasDocumentInCollaboration($fFolderID);
- $main->setDHTMLScrolling(false);
- $main->setOnLoadJavaScript("switchDiv('" . (isset($fShowSection) ? $fShowSection : "folderData") . "', 'folder')");
-
- $oPatternCustom->setHtml(getPage($fFolderID, "", $bCollaboration));
- $main->setHasRequiredFields(true);
- $_SESSION["pageAccess"][$default->rootUrl . '/presentation/lookAndFeel/knowledgeTree/store.php'] = true;
- $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=browse&fFolderID=$fFolderID"));
-}
-
$main->setCentralPayload($oPatternCustom);
$main->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
index 1b1747f..1519c68 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
@@ -68,44 +68,6 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") {
}
}
-function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
- global $default;
- //had to use coalesce and left outer join for user_id because this column was a new addition
- //and the user_ids for existing documents before this change will be null
- /*ok*/ $sQuery = array("SELECT GFAL.id as id, GFAL.folder_id AS folder_id, COALESCE(G.name, 'Not Assigned') AS group_name, G.id AS group_id, GFAL.role_id AS role_id, R.name AS role_name, GFAL.precedence AS precedence, COALESCE(U.id, -1) AS user_id, COALESCE(U.name, 'Not Assigned') AS user_name, 'Edit' as edit, 'Delete' as del, 'Dependant docs' as depn " .
- "FROM $default->groups_folders_approval_table AS GFAL INNER JOIN roles AS R ON GFAL.role_id = R.id " .
- "LEFT OUTER JOIN $default->groups_table AS G ON G.id = GFAL.group_id " .
- "LEFT OUTER JOIN $default->users_table AS U ON U.id = GFAL.user_id " .
- "WHERE GFAL.folder_id = ? " .
- "ORDER BY GFAL.precedence, role_name ASC", $iFolderID);
-
- $aColumns = array("group_name", "role_name", "precedence", "user_name", "edit", "del", "depn");
- $aColumnHeaders = array(_("Group"), _("Role"), _("Seq"), _("User"), "", "");
- $aColumnTypes = array(1,1,1,1,3,3,3);
- $aDBColumnArray = array("id","folder_id","group_id","user_id","precedence","role_id");
- $aQueryStringVariableNames = array("fFolderCollaborationID", "fFolderID", "fGroupID","fUserID","fSequenceNumber","fRoleID");
- $aLinkURLs = array(4=>"$default->rootUrl/control.php?action=modifyFolderCollaboration",5=>"$default->rootUrl/control.php?action=deleteFolderCollaboration", 6=>"$default->rootUrl/control.php?action=viewDependantDocument");
-
- $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
- $oPatternTableSqlQuery->setTableHeading(_("Document Routing"));
- $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
-
- $sToRender .= "";
- if ($bCollaboration) {
- $sToRender .= "| " . _("Documents in this folder are currently undergoing this collaboration process, so these steps can't be altered") . " | ";
- }
- $sToRender .= "| " . $oPatternTableSqlQuery->render() . " | ";
- if (!$bCollaboration) {
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "rootUrl/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\">![](\"") \n";
- $sToRender .= " | \n";
- $sToRender .= " \n";
- }
- $sToRender .= " ";
- return renderSectionDiv($sDivName, $sToRender);
-}
-
function getFolderDocTypes($iFolderID, $sDivName) {
$sTable = KTUtil::getTableName('folder_doctypes');
$aQuery = array(
@@ -153,7 +115,7 @@ function renderFolderSection($sSectionName, $sHeadingText, $bDisplayLink, $iFold
return "| $sLink | \n";
}
-function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) {
+function getPage($iFolderID, $sStatusMessage) {
global $default;
$sToRender = "";
@@ -168,7 +130,6 @@ function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) {
$bDisplayLink = ($sStatusMessage) ? true : false;
$sToRender .= renderFolderSection("folderData", _("Folder Data"), $bDisplayLink, $iFolderID);
- $sToRender .= renderFolderSection("folderRouting", _("Document Routing"), $bDisplayLink, $iFolderID);
$sToRender .= renderFolderSection("documentTypes", _("Document Types"), $bDisplayLink, $iFolderID);
$sToRender .= "";
$sToRender .= " | ";
@@ -180,7 +141,6 @@ function getPage($iFolderID, $sStatusMessage, $bCollaboration = false) {
$sToRender .= "";
}
$sToRender .= getFolderData($iFolderID, "folderData");
- $sToRender .= getFolderRouting($iFolderID, "folderRouting", $bCollaboration);
$sToRender .= getFolderDocTypes($iFolderID, "documentTypes");
if (!$default->bNN4) {
$sToRender .= " ";
@@ -202,7 +162,6 @@ function getStatusPage($iFolderID, $sStatusMessage) {
$bDisplayLink = ($sStatusMessage) ? true : false;
$sToRender .= renderFolderSection("folderData", _("Folder Data"), $bDisplayLink, $iFolderID);
- $sToRender .= renderFolderSection("folderRouting", _("Document Routing"), $bDisplayLink, $iFolderID);
$sToRender .= renderFolderSection("documentTypes", _("Document Types"), $bDisplayLink, $iFolderID);
$sToRender .= renderFolderSection("folderPermissions", _("Folder Permissions"), $bDisplayLink, $iFolderID);
diff --git a/presentation/lookAndFeel/knowledgeTree/help/modifyDocumentRoutingHelp.html b/presentation/lookAndFeel/knowledgeTree/help/modifyDocumentRoutingHelp.html
deleted file mode 100644
index 0a26176..0000000
--- a/presentation/lookAndFeel/knowledgeTree/help/modifyDocumentRoutingHelp.html
+++ /dev/null
@@ -1,9 +0,0 @@
-Modify Document Routing
-
-
- - Use the drowp-down list to select the player that will fulfil the
-selected role. Note: Only users belonging to the displayed group
-will appear in the drop-down list.
- - Click the Update button to save your selection or the Cancel button
-to discard it.
-
diff --git a/presentation/lookAndFeel/knowledgeTree/js/divSwitch.js b/presentation/lookAndFeel/knowledgeTree/js/divSwitch.js
index 5b81dcb..7ad2d45 100644
--- a/presentation/lookAndFeel/knowledgeTree/js/divSwitch.js
+++ b/presentation/lookAndFeel/knowledgeTree/js/divSwitch.js
@@ -6,8 +6,8 @@
function switchDiv(div_id, object)
{
var aDocumentDivs = new Array("documentData", "genericMetaData", "typeSpecificMetaData",
- "archiveSettings", "documentRouting", "linkedDocuments");
- var aFolderDivs = new Array("folderData", "folderRouting", "documentTypes", "folderPermissions");
+ "archiveSettings", "linkedDocuments", "metadataVersions");
+ var aFolderDivs = new Array("folderData", "documentTypes", "folderPermissions");
var aSearchDivs = new Array("searchLess", "searchMore");
var style_sheet = getStyleObject(div_id);
|