Peter M. Groen / knowledgetree

Commit 4f550fed0ae13b9fafc3c8daaff76d3c06752557

Authored by rob
1 parent 0fad826d

Changed references from Document.inc to DocumentCollaboration.inc 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1762 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
  View file @4f550fe
... ... @@ -64,7 +64,7 @@ function renderCheckInPage($oDocument) {
64 64 $sToRender .= "<tr><td>\n";
65 65  
66 66 // if collaboration has started then revisions are minor
67   - if (Document::documentCollaborationStarted($oDocument->getID())) {
  67 + if (DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) {
68 68 $sToRender .= "<input type=\"hidden\" name=\"fCheckInType\" value=\"minor\"/>\n";
69 69 // else there is no collaboration, revisions are major (or override?)
70 70 } else {
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @4f550fe
... ... @@ -210,12 +210,12 @@ function getEditPage($oDocument) {
210 210 $sToRender .= "\t\t<td>" . renderEditableDocumentRouting($oDocument) . "</td>\n";
211 211 $sToRender .= "\t</tr>";
212 212 $sToRender .= "\t<tr>\n";
213   - if ($oDocument->hasCollaboration() && (!Document::documentCollaborationStarted($oDocument->getID())) && ($_SESSION["userID"] == $oDocument->getCreatorID())) {
  213 + if ($oDocument->hasCollaboration() && (!DocumentCollaboration::documentCollaborationStarted($oDocument->getID())) && ($_SESSION["userID"] == $oDocument->getCreatorID())) {
214 214 //if not all collaboration steps have been set, then you cannot start the collaboration process
215 215 //only the creator of the document can start the collaboration process
216 216 $sToRender .= "\t\t<td><a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fBeginCollaboration=1><img src=\"$default->graphicsUrl/widgets/begin.gif\" border=\"0\"/></a>";
217 217 $sToRender .= "</td>\n";
218   - } else if (Document::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
  218 + } else if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
219 219 //if the current user is responsible for an active step in the collaboration process
220 220 $sToRender .= "\t\t<td><table border=\"0\"><tr>\n";
221 221 $sToRender .= "\t\t<td><b>You currently have an active role<br> in the collaboration process</b></td>\n";
... ... @@ -224,12 +224,12 @@ function getEditPage($oDocument) {
224 224 $sToRender .= "\t\t</tr></table></td>\n";
225 225 }
226 226  
227   - if (!Document::documentIsPendingWebPublishing($iDocumentID)) {
  227 + if (!DocumentCollaboration::documentIsPendingWebPublishing($iDocumentID)) {
228 228 // only display for unpublished documents
229 229 // if there is collaboration
230 230 if ($oDocument->hasCollaboration()) {
231 231 // only display publish button if collaboration is complete and you're the last user in the collaboration process
232   - if (Document::documentCollaborationDone($oDocument->getID()) && ($_SESSION["userID"] == Document::getLastCollaboratorID($iDocumentID))) {
  232 + if (DocumentCollaboration::documentCollaborationDone($oDocument->getID()) && ($_SESSION["userID"] == DocumentCollaboration::getLastCollaboratorID($iDocumentID))) {
233 233 $sToRender .= "<td><a href=" . $_SERVER['PHP_SELF'] . "?fDocumentID=" . $oDocument->getID() . "&fForPublish=1><img src=\"$default->graphicsUrl/widgets/publish.gif\" border=\"0\"/></a></td>\n";
234 234 }
235 235 } else if ($_SESSION["userID"] == $oDocument->getCreatorID()) {
... ... @@ -284,7 +284,7 @@ function getViewPage($oDocument) {
284 284 $sToRender .= "\t<tr>\n";
285 285 $sToRender .= "\t\t<td>" . renderNonEditableDocumentRouting($oDocument) . "</td>\n";
286 286 $sToRender .= "\t</tr>";
287   - if (Document::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
  287 + if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($oDocument->getID())) {
288 288 //if the current user is responsible for an active step in the collaboration process
289 289 $sToRender .= "\t\t<tr><td><table border=\"0\"><tr>\n";
290 290 $sToRender .= "\t\t<td><b>You currently have an active role<br> in the collaboration process</b></td>\n";
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php
  View file @4f550fe
... ... @@ -4,6 +4,7 @@ require_once(&quot;../../../../config/dmsDefaults.php&quot;);
4 4 require_once("$default->fileSystemRoot/lib/email/Email.inc");
5 5 require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
6 6 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
  7 +require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc");
7 8 require_once("$default->fileSystemRoot/lib/web/WebDocument.inc");
8 9 require_once("$default->fileSystemRoot/lib/web/WebSite.inc");
9 10 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
... ...