From fe33f93506252997c2e942de6204fbc57ff0bf20 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 23 Jun 2003 07:27:29 +0000 Subject: [PATCH] Fixed template document display name error --- presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php index 5433143..92fe132 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php @@ -36,9 +36,10 @@ if (checkSession()) { } else { $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID); $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId()); + $oTemplateDocument = Document::get($oDependantDocumentTemplate->getTemplateDocumentID()); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), Document::getName($oDependantDocumentTemplate->getTemplateDocumentID()))); + $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), (!($oTemplateDocument->getName() === false)) ? $oTemplateDocument->getName() : "")); $main->setCentralPayload($oPatternCustom); $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1"); $main->setErrorMessage("An error occured while attempting to delete the dependant document"); @@ -50,9 +51,10 @@ if (checkSession()) { $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID); $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId()); + $oTemplateDocument = Document::get($oDependantDocumentTemplate->getTemplateDocumentID()); $oPatternCustom = & new PatternCustom(); - $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), Document::getName($oDependantDocumentTemplate->getTemplateDocumentID()))); + $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), (!($oTemplateDocument->getName() === false)) ? $oTemplateDocument->getName() : "")); $main->setCentralPayload($oPatternCustom); $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1"); $main->render(); -- libgit2 0.21.4