From 406e6d490555a4d6f04a5b1a572166a7f0dc548f Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 8 May 2003 09:50:18 +0000 Subject: [PATCH] Changed references from Document.inc to DocumentCollaboration.inc --- presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc | 2 +- presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc | 10 +++++----- presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc index 6941a61..a72e773 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc @@ -64,7 +64,7 @@ function renderCheckInPage($oDocument) { $sToRender .= "\n"; // if collaboration has started then revisions are minor - if (Document::documentCollaborationStarted($oDocument->getID())) { + if (DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) { $sToRender .= "\n"; // else there is no collaboration, revisions are major (or override?) } else { diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc index 021cafb..d9d4753 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc @@ -210,12 +210,12 @@ function getEditPage($oDocument) { $sToRender .= "\t\t" . renderEditableDocumentRouting($oDocument) . "\n"; $sToRender .= "\t"; $sToRender .= "\t\n"; - if ($oDocument->hasCollaboration() && (!Document::documentCollaborationStarted($oDocument->getID())) && ($_SESSION["userID"] == $oDocument->getCreatorID())) { + if ($oDocument->hasCollaboration() && (!DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) && ($_SESSION["userID"] == $oDocument->getCreatorID())) { //if not all collaboration steps have been set, then you cannot start the collaboration process //only the creator of the document can start the collaboration process $sToRender .= "\t\tgraphicsUrl/widgets/begin.gif\" border=\"0\"/>"; $sToRender .= "\n"; - } else if (Document::userIsPerformingCurrentCollaborationStep($oDocument->getID())) { + } else if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) { //if the current user is responsible for an active step in the collaboration process $sToRender .= "\t\t\n"; $sToRender .= "\t\t\n"; @@ -224,12 +224,12 @@ function getEditPage($oDocument) { $sToRender .= "\t\t
You currently have an active role
in the collaboration process
\n"; } - if (!Document::documentIsPendingWebPublishing($iDocumentID)) { + if (!DocumentCollaboration::documentIsPendingWebPublishing($iDocumentID)) { // only display for unpublished documents // if there is collaboration if ($oDocument->hasCollaboration()) { // only display publish button if collaboration is complete and you're the last user in the collaboration process - if (Document::documentCollaborationDone($oDocument->getID()) && ($_SESSION["userID"] == Document::getLastCollaboratorID($iDocumentID))) { + if (DocumentCollaboration::documentCollaborationDone($oDocument->getID()) && ($_SESSION["userID"] == DocumentCollaboration::getLastCollaboratorID($iDocumentID))) { $sToRender .= "graphicsUrl/widgets/publish.gif\" border=\"0\"/>\n"; } } else if ($_SESSION["userID"] == $oDocument->getCreatorID()) { @@ -284,7 +284,7 @@ function getViewPage($oDocument) { $sToRender .= "\t\n"; $sToRender .= "\t\t" . renderNonEditableDocumentRouting($oDocument) . "\n"; $sToRender .= "\t"; - if (Document::userIsPerformingCurrentCollaborationStep($oDocument->getID())) { + if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) { //if the current user is responsible for an active step in the collaboration process $sToRender .= "\t\t\n"; $sToRender .= "\t\t\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php index 4442028..5de7499 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php @@ -4,6 +4,7 @@ require_once("../../../../config/dmsDefaults.php"); 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"); -- libgit2 0.21.4
You currently have an active role
in the collaboration process