Peter M. Groen / knowledgetree

Commit c5099a0fb32b961df163a57303a37f84d6a0cb1e

Authored by michael
1 parent 64dfc3ba

changed to display with document details 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2166 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 9 additions and 6 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentBL.php
  View file @c5099a0
@@ -37,6 +37,7 @@ if (checkSession()) { @@ -37,6 +37,7 @@ if (checkSession()) {
37 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc"); 37 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc");
38 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); 38 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
39 39
  40 + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkInDocumentUI.inc");
40 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); 41 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc");
41 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc"); 42 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc");
42 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); 43 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
@@ -116,11 +117,11 @@ if (checkSession()) { @@ -116,11 +117,11 @@ if (checkSession()) {
116 } 117 }
117 } else { 118 } else {
118 $sErrorMessage = "Please select a document by first clicking on 'Browse'. Then click 'Check-In'"; 119 $sErrorMessage = "Please select a document by first clicking on 'Browse'. Then click 'Check-In'";
119 - $oPatternCustom->setHtml(getCheckInEditPage($oDocument)); 120 + $oPatternCustom->setHtml(getCheckInPage($oDocument));
120 } 121 }
121 } else { 122 } else {
122 // prompt the user for a check in comment and the file 123 // prompt the user for a check in comment and the file
123 - $oPatternCustom->setHtml(getCheckInEditPage($oDocument)); 124 + $oPatternCustom->setHtml(getCheckInPage($oDocument));
124 } 125 }
125 } else { 126 } else {
126 // you don't have this doc checked out 127 // you don't have this doc checked out
presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentBL.php
  View file @c5099a0
@@ -25,6 +25,7 @@ if (checkSession()) { @@ -25,6 +25,7 @@ if (checkSession()) {
25 require_once("$default->fileSystemRoot/lib/documentmanagement/PhysicalDocumentManager.inc"); 25 require_once("$default->fileSystemRoot/lib/documentmanagement/PhysicalDocumentManager.inc");
26 require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc"); 26 require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
27 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); 27 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
  28 + require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc");
28 29
29 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc"); 30 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
30 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc"); 31 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc");
@@ -37,6 +38,7 @@ if (checkSession()) { @@ -37,6 +38,7 @@ if (checkSession()) {
37 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc"); 38 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc");
38 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); 39 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
39 40
  41 + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc");
40 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); 42 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc");
41 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc"); 43 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc");
42 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); 44 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
@@ -78,8 +80,7 @@ if (checkSession()) { @@ -78,8 +80,7 @@ if (checkSession()) {
78 $default->log->info("checkOutDocumentBL.php fired $count subscription alerts for checked out document " . $oDocument->getName()); 80 $default->log->info("checkOutDocumentBL.php fired $count subscription alerts for checked out document " . $oDocument->getName());
79 81
80 // display checkout success message in the document view page 82 // display checkout success message in the document view page
81 - $oPatternCustom->setHtml(getCheckOutEditPage($oDocument, true));  
82 - 83 + $oPatternCustom->setHtml(getCheckOutPage($oDocument, true));
83 84
84 } else { 85 } else {
85 // document update failed 86 // document update failed
@@ -87,7 +88,7 @@ if (checkSession()) { @@ -87,7 +88,7 @@ if (checkSession()) {
87 } 88 }
88 } else { 89 } else {
89 // prompt the user for a checkout comment 90 // prompt the user for a checkout comment
90 - $oPatternCustom->setHtml(getCheckOutEditPage($oDocument)); 91 + $oPatternCustom->setHtml(getCheckOutPage($oDocument));
91 } 92 }
92 } else { 93 } else {
93 // this document is already checked out 94 // this document is already checked out
@@ -109,9 +110,10 @@ if (checkSession()) { @@ -109,9 +110,10 @@ if (checkSession()) {
109 $oPatternCustom->setHtml(renderErrorPage("No document is currently selected for check out")); 110 $oPatternCustom->setHtml(renderErrorPage("No document is currently selected for check out"));
110 } 111 }
111 112
  113 +
112 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 114 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
113 $main->setCentralPayload($oPatternCustom); 115 $main->setCentralPayload($oPatternCustom);
114 $main->setFormAction($_SERVER["PHP_SELF"]); 116 $main->setFormAction($_SERVER["PHP_SELF"]);
115 $main->render(); 117 $main->render();
116 } 118 }
117 -?> 119 -?>
  120 +?>
118 \ No newline at end of file 121 \ No newline at end of file