From f5a17a6c6196427cfa114f00f94ca4dd8e9361b1 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Wed, 18 Aug 2004 09:37:13 +0000 Subject: [PATCH] Corrected display error when moving a document. Also implemented more efficient object instead of id passing. --- presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php | 4 ++-- presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php index 4105799..1cc301e 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php @@ -123,14 +123,14 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); $oDocument = Document::get($fDocumentID); - + $oFolder = Folder::get($fFolderID); // check if the selected folder has the same document type as the document we're moving if (Folder::folderIsLinkedToDocType($fFolderID, $oDocument->getDocumentTypeID())) { // check that there is no filename collision in the destination directory $sNewDocumentFileSystemPath = Folder::getFolderPath($fFolderID) . $oDocument->getFileName(); if (!file_exists($sNewDocumentFileSystemPath)) { // display confirmation page - $oPatternCustom->setHtml(getConfirmationPage($fFolderID, $fDocumentID)); + $oPatternCustom->setHtml(getConfirmationPage($oFolder, $oDocument)); } else { // filename collision $oPatternCustom->setHtml(getPage($fFolderID, $fDocumentID, "This folder already contains a document of the same name. Please choose another directory")); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc index 271f31e..38c4f0e 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc @@ -25,20 +25,27 @@ * @package documentmanagement */ -function getConfirmationPage($iFolderID, $iDocumentID) { +function getConfirmationPage($oFolder, $oDocument) { global $default; $sToRender = renderHeading("Move Document"); $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "
Are you sure you want to move
" . Document::getDocumentDisplayPath($iDocumentID) . " to
" . Folder::getFolderDisplayPath($iFolderID) . " > " . Document::getDocumentName($iDocumentID) . "
" . $oDocument->getDisplayPath() . " to
" . Folder::getFolderDisplayPath($oFolder->getID()) . " > " . $oDocument->getFileName() . "
rootUrl/control.php?action=moveDocument&fDocumentID=$iDocumentID&fFolderID=$iFolderID&fForMove=1&fConfirmed=1\">graphicsUrl/widgets/move.gif\" border=\"0\"/> rootUrl/control.php?action=viewDocument&fDocumentID=" . $iDocumentID . "\">graphicsUrl/widgets/cancel.gif\" border=\"0\">
rootUrl/control.php?action=moveDocument&fDocumentID=" . + $oDocument->getID() . "&fFolderID=" . $oFolder->getID() . + "&fForMove=1&fConfirmed=1\">" . + "graphicsUrl/widgets/move.gif\" border=\"0\"/>" . + " " . + "rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\">" . + "graphicsUrl/widgets/cancel.gif\" border=\"0\">" . + "
\n"; return $sToRender; } - +// FIXME: change these to object references instead of IDs function getPage($iFolderID, $iDocumentID, $sErrorMessage = "") { global $default; $sToRender = renderHeading("Move Document"); -- libgit2 0.21.4