Peter M. Groen / knowledgetree

Commit ba4abe392ccd2f1e7e9441518ca3f9415be4d340

Authored by michaeljoseph
1 parent f907fc9a

Corrected display error when moving a document. Also implemented more efficient… 

… object instead of id passing.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2917 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 14 additions and 7 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php
  View file @ba4abe3
@@ -123,14 +123,14 @@ if (checkSession()) { @@ -123,14 +123,14 @@ if (checkSession()) {
123 $oPatternCustom = & new PatternCustom(); 123 $oPatternCustom = & new PatternCustom();
124 124
125 $oDocument = Document::get($fDocumentID); 125 $oDocument = Document::get($fDocumentID);
126 - 126 + $oFolder = Folder::get($fFolderID);
127 // check if the selected folder has the same document type as the document we're moving 127 // check if the selected folder has the same document type as the document we're moving
128 if (Folder::folderIsLinkedToDocType($fFolderID, $oDocument->getDocumentTypeID())) { 128 if (Folder::folderIsLinkedToDocType($fFolderID, $oDocument->getDocumentTypeID())) {
129 // check that there is no filename collision in the destination directory 129 // check that there is no filename collision in the destination directory
130 $sNewDocumentFileSystemPath = Folder::getFolderPath($fFolderID) . $oDocument->getFileName(); 130 $sNewDocumentFileSystemPath = Folder::getFolderPath($fFolderID) . $oDocument->getFileName();
131 if (!file_exists($sNewDocumentFileSystemPath)) { 131 if (!file_exists($sNewDocumentFileSystemPath)) {
132 // display confirmation page 132 // display confirmation page
133 - $oPatternCustom->setHtml(getConfirmationPage($fFolderID, $fDocumentID)); 133 + $oPatternCustom->setHtml(getConfirmationPage($oFolder, $oDocument));
134 } else { 134 } else {
135 // filename collision 135 // filename collision
136 $oPatternCustom->setHtml(getPage($fFolderID, $fDocumentID, "This folder already contains a document of the same name. Please choose another directory")); 136 $oPatternCustom->setHtml(getPage($fFolderID, $fDocumentID, "This folder already contains a document of the same name. Please choose another directory"));
presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
  View file @ba4abe3
@@ -25,20 +25,27 @@ @@ -25,20 +25,27 @@
25 * @package documentmanagement 25 * @package documentmanagement
26 */ 26 */
27 27
28 -function getConfirmationPage($iFolderID, $iDocumentID) { 28 +function getConfirmationPage($oFolder, $oDocument) {
29 global $default; 29 global $default;
30 $sToRender = renderHeading("Move Document"); 30 $sToRender = renderHeading("Move Document");
31 $sToRender .= "<table>\n"; 31 $sToRender .= "<table>\n";
32 $sToRender .= "<tr>\n<td>Are you sure you want to move </td></tr>"; 32 $sToRender .= "<tr>\n<td>Are you sure you want to move </td></tr>";
33 - $sToRender .= "<tr><td><strong>" . Document::getDocumentDisplayPath($iDocumentID) . "</strong> to </td></tr>\n";  
34 - $sToRender .= "<tr><td><strong>" . Folder::getFolderDisplayPath($iFolderID) . " > " . Document::getDocumentName($iDocumentID) . "</strong></td>\n"; 33 + $sToRender .= "<tr><td><strong>" . $oDocument->getDisplayPath() . "</strong> to </td></tr>\n";
  34 + $sToRender .= "<tr><td><strong>" . Folder::getFolderDisplayPath($oFolder->getID()) . " > " . $oDocument->getFileName() . "</strong></td>\n";
35 $sToRender .= "</tr>\n"; 35 $sToRender .= "</tr>\n";
36 - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=moveDocument&fDocumentID=$iDocumentID&fFolderID=$iFolderID&fForMove=1&fConfirmed=1\"><img src=\"$default->graphicsUrl/widgets/move.gif\" border=\"0\"/></a>&nbsp;<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $iDocumentID . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr>\n"; 36 + $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=moveDocument&fDocumentID=" .
  37 + $oDocument->getID() . "&fFolderID=" . $oFolder->getID() .
  38 + "&fForMove=1&fConfirmed=1\">" .
  39 + "<img src=\"$default->graphicsUrl/widgets/move.gif\" border=\"0\"/>" .
  40 + "</a>&nbsp;" .
  41 + "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\">" .
  42 + "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a>" .
  43 + "</td></tr>\n";
37 $sToRender .= "</table>\n"; 44 $sToRender .= "</table>\n";
38 return $sToRender; 45 return $sToRender;
39 } 46 }
40 47
41 - 48 +// FIXME: change these to object references instead of IDs
42 function getPage($iFolderID, $iDocumentID, $sErrorMessage = "") { 49 function getPage($iFolderID, $iDocumentID, $sErrorMessage = "") {
43 global $default; 50 global $default;
44 $sToRender = renderHeading("Move Document"); 51 $sToRender = renderHeading("Move Document");