Peter M. Groen / knowledgetree

Commit 909f9d2c7238801e69bcd6b49cb9001a997530ae

Authored by rob
1 parent 89b6a0ce

Fixed template document display name error 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2226 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentBL.php
  View file @909f9d2
@@ -36,9 +36,10 @@ if (checkSession()) { @@ -36,9 +36,10 @@ if (checkSession()) {
36 } else { 36 } else {
37 $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID); 37 $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID);
38 $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId()); 38 $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId());
  39 + $oTemplateDocument = Document::get($oDependantDocumentTemplate->getTemplateDocumentID());
39 40
40 $oPatternCustom = & new PatternCustom(); 41 $oPatternCustom = & new PatternCustom();
41 - $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), Document::getName($oDependantDocumentTemplate->getTemplateDocumentID()))); 42 + $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), (!($oTemplateDocument->getName() === false)) ? $oTemplateDocument->getName() : ""));
42 $main->setCentralPayload($oPatternCustom); 43 $main->setCentralPayload($oPatternCustom);
43 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1"); 44 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1");
44 $main->setErrorMessage("An error occured while attempting to delete the dependant document"); 45 $main->setErrorMessage("An error occured while attempting to delete the dependant document");
@@ -50,9 +51,10 @@ if (checkSession()) { @@ -50,9 +51,10 @@ if (checkSession()) {
50 51
51 $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID); 52 $oDependantDocumentTemplate = DependantDocumentTemplate::get($fDependantDocumentTemplateID);
52 $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId()); 53 $oUser = User::get($oDependantDocumentTemplate->getDefaultUserId());
  54 + $oTemplateDocument = Document::get($oDependantDocumentTemplate->getTemplateDocumentID());
53 55
54 $oPatternCustom = & new PatternCustom(); 56 $oPatternCustom = & new PatternCustom();
55 - $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), Document::getName($oDependantDocumentTemplate->getTemplateDocumentID()))); 57 + $oPatternCustom->setHtml(getPage($fFolderID, $fFolderCollaborationID, $oDependantDocumentTemplate->getDocumentTitle(), $oUser->getName(), (!($oTemplateDocument->getName() === false)) ? $oTemplateDocument->getName() : ""));
56 $main->setCentralPayload($oPatternCustom); 58 $main->setCentralPayload($oPatternCustom);
57 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1"); 59 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fDependantDocumentTemplateID=$fDependantDocumentTemplateID&fForDelete=1");
58 $main->render(); 60 $main->render();