Peter M. Groen / knowledgetree

Commit f0b2e31145d21364cc8326d2ad8fcfdc6c9e0f5c

Authored by mukhtar
1 parent 40c696ef

no message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1413 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeBL.php
  View file @f0b2e31
@@ -40,7 +40,12 @@ if (checkSession()) { @@ -40,7 +40,12 @@ if (checkSession()) {
40 $oDocType = DocumentType::get($fDocTypeID); 40 $oDocType = DocumentType::get($fDocTypeID);
41 $oDocType->setName($fDocTypeName); 41 $oDocType->setName($fDocTypeName);
42 42
  43 +
43 if ($oDocType->delete()) { 44 if ($oDocType->delete()) {
  45 +
  46 + //delete all fields as well
  47 + $oDocType->deleteAllFieldLinks();
  48 +
44 $oPatternCustom->setHtml(getDeleteSuccessPage()); 49 $oPatternCustom->setHtml(getDeleteSuccessPage());
45 50
46 } else { 51 } else {
presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc
  View file @f0b2e31
@@ -77,7 +77,7 @@ $sToRender .= "<td><b>Deletion Failed!</b></td>\n"; @@ -77,7 +77,7 @@ $sToRender .= "<td><b>Deletion Failed!</b></td>\n";
77 $sToRender .= "</tr>\n"; 77 $sToRender .= "</tr>\n";
78 $sToRender .= "<tr></tr>\n"; 78 $sToRender .= "<tr></tr>\n";
79 $sToRender .= "<tr></tr>\n"; 79 $sToRender .= "<tr></tr>\n";
80 -$sToRender .= "<tr><td>Please Ensure that the Document Type have been Removed from the Fields it Belongs to</td></tr>\n"; 80 +$sToRender .= "<tr><td>Please Ensure that the Document Type has been Removed from ALL Folders</td></tr>\n";
81 $sToRender .= "<tr></tr>\n"; 81 $sToRender .= "<tr></tr>\n";
82 $sToRender .= "</tr>\n"; 82 $sToRender .= "</tr>\n";
83 $sToRender .= "<tr><td align = right><a href=\"$default->rootUrl/control.php?action=removeDocType\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td></tr>\n"; 83 $sToRender .= "<tr><td align = right><a href=\"$default->rootUrl/control.php?action=removeDocType\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td></tr>\n";