Peter M. Groen / knowledgetree

Commit 4e91c5b76a4ee9a51f0b76b90c6ee636dc14bd8e

Authored by Michael Joseph
1 parent f842bc4f

(#2832) moved checked out user details to confirmation page 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2531 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 10 deletions
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
  View file @4e91c5b
@@ -21,17 +21,17 @@ function getEditCheckoutPage($fDocumentID){ @@ -21,17 +21,17 @@ function getEditCheckoutPage($fDocumentID){
21 global $default; 21 global $default;
22 22
23 $oDocument = Document::get($fDocumentID); 23 $oDocument = Document::get($fDocumentID);
  24 + $oUser = User::get($oDocument->getCheckedOutUserID());
24 $sToRender .= renderHeading("Edit Document Checkout"); 25 $sToRender .= renderHeading("Edit Document Checkout");
25 $sToRender .= "<table>\n"; 26 $sToRender .= "<table>\n";
26 - $sToRender .= "<tr><td>Are you sure you want to Check In this document:</tr></td>";  
27 - $sToRender .= "<tr><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>"; 27 + $sToRender .= "<tr><td colspan=\"2\">Are you sure you want to Check In this document:</tr></td>";
  28 + $sToRender .= "<tr><td width=\"20%\">Path</td><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>";
  29 + $sToRender .= "<tr><td>Checked Out By</td><td><b>" . $oUser->getName() . "</b></td></tr>";
28 $sToRender .= "<input type=\"hidden\" name=\"fUpdate\" value=\"1\">\n"; 30 $sToRender .= "<input type=\"hidden\" name=\"fUpdate\" value=\"1\">\n";
29 $sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n"; 31 $sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n";
30 $sToRender .= "<tr>\n"; 32 $sToRender .= "<tr>\n";
31 - $sToRender .= "<td align=right>\n"; 33 + $sToRender .= "<td colspan=\"2\" align=right>\n";
32 $sToRender .= getUpdateButton(); 34 $sToRender .= getUpdateButton();
33 - $sToRender .= "</td>\n";  
34 - $sToRender .= "<td >\n";  
35 $sToRender .= getCancelButton(); 35 $sToRender .= getCancelButton();
36 $sToRender .= "</td>\n"; 36 $sToRender .= "</td>\n";
37 $sToRender .= "</tr>\n"; 37 $sToRender .= "</tr>\n";
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
  View file @4e91c5b
@@ -20,14 +20,12 @@ if (checkSession()) { @@ -20,14 +20,12 @@ if (checkSession()) {
20 $oPatternCustom = & new PatternCustom(); 20 $oPatternCustom = & new PatternCustom();
21 $aDocuments = Document::getList("is_checked_out = 1"); 21 $aDocuments = Document::getList("is_checked_out = 1");
22 $sToRender .= renderHeading("Checked out Documents"); 22 $sToRender .= renderHeading("Checked out Documents");
23 - $sToRender .= "<table><tr><th width=\"80\">Document</th><th>Checked Out By</th><th>&nbsp;</th>"; 23 + $sToRender .= "<table><tr><th width=\"80%\">Document</th><th>&nbsp;</th>";
24 if (count($aDocuments) > 0) { 24 if (count($aDocuments) > 0) {
25 for ($i=0; $i<count($aDocuments); $i++) { 25 for ($i=0; $i<count($aDocuments); $i++) {
26 if ($aDocuments[$i]) { 26 if ($aDocuments[$i]) {
27 - $oUser = User::get($aDocuments[$i]->getCheckedOutUserID());  
28 - $sToRender .= "<tr><td>" . $aDocuments[$i]->getDisplayPath() . "</td>";  
29 - $sToRender .= "<td>" . $oUser->getName() . "</td>";  
30 - $sToRender .= "<td>" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), "Check In") . "</td>"; 27 + $sToRender .= "<tr><td width=\"80%\">" . $aDocuments[$i]->getDisplayPath() . "</td>";
  28 + $sToRender .= "<td align=\"right\">" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), "Check In") . "</td>";
31 } 29 }
32 } 30 }
33 } else { 31 } else {