Peter M. Groen / knowledgetree

Commit 86fff94b8ec467a20ddbdafd53adc0cefaeef7af

Authored by rob
1 parent eb5a35ea

no message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@862 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 30 additions and 20 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
  View file @86fff94
@@ -27,29 +27,46 @@ if (checkSession()) { @@ -27,29 +27,46 @@ if (checkSession()) {
27 if (isset($fForDelete)) { 27 if (isset($fForDelete)) {
28 //attempt to delete the new folder collaboration entry 28 //attempt to delete the new folder collaboration entry
29 $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID); 29 $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID);
30 - if ($oFolderCollaboration->delete()) {  
31 - //on successful deletion, redirect to the folder edit page  
32 - include_once("$default->owl_fs_root/presentation/Html.inc");  
33 - redirect("$default->owl_root_url/control.php?action=editFolder&fFolderID=$fFolderID");  
34 - } else {  
35 - //otherwise display an error message 30 + if ($oFolderCollaboration->hasDocumentInProcess()) {
36 include_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc"); 31 include_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
37 - include_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");  
38 - 32 + include_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
39 include_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); 33 include_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
40 include_once("$default->owl_fs_root/presentation/Html.inc"); 34 include_once("$default->owl_fs_root/presentation/Html.inc");
41 include_once("$default->owl_fs_root/presentation/webpageTemplate.inc"); 35 include_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
42 include_once("deleteFolderCollaborationUI.inc"); 36 include_once("deleteFolderCollaborationUI.inc");
43 - 37 +
44 $oPatternCustom = & new PatternCustom(); 38 $oPatternCustom = & new PatternCustom();
45 - $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID);  
46 - $oPatternCustom->setHtml(getPage($oFolderCollaboration->getFolderID(), $oFolderCollaboration->getGroupID(), $oFolderCollaboration->getRoleID(), $oFolderCollaboration->getSequenceNumber()));  
47 - $main->setErrorMessage("The folder collaboration entry could not be deleted from the database"); 39 + $oPatternCustom->setHtml("");
48 $main->setCentralPayload($oPatternCustom); 40 $main->setCentralPayload($oPatternCustom);
  41 + $main->setErrorMessage("You cannot delete this step as there is a ");
49 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForDelete=1"); 42 $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForDelete=1");
50 $main->setHasRequiredFields(true); 43 $main->setHasRequiredFields(true);
51 $main->render(); 44 $main->render();
52 - 45 + } else {
  46 + if ($oFolderCollaboration->delete()) {
  47 + //on successful deletion, redirect to the folder edit page
  48 + include_once("$default->owl_fs_root/presentation/Html.inc");
  49 + redirect("$default->owl_root_url/control.php?action=editFolder&fFolderID=$fFolderID");
  50 + } else {
  51 + //otherwise display an error message
  52 + include_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
  53 + include_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
  54 +
  55 + include_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
  56 + include_once("$default->owl_fs_root/presentation/Html.inc");
  57 + include_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
  58 + include_once("deleteFolderCollaborationUI.inc");
  59 +
  60 + $oPatternCustom = & new PatternCustom();
  61 + $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID);
  62 + $oPatternCustom->setHtml(getPage($oFolderCollaboration->getFolderID(), $oFolderCollaboration->getGroupID(), $oFolderCollaboration->getRoleID(), $oFolderCollaboration->getSequenceNumber()));
  63 + $main->setErrorMessage("The folder collaboration entry could not be deleted from the database");
  64 + $main->setCentralPayload($oPatternCustom);
  65 + $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForDelete=1");
  66 + $main->setHasRequiredFields(true);
  67 + $main->render();
  68 +
  69 + }
53 } 70 }
54 } else { 71 } else {
55 //display the browse page 72 //display the browse page
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc
  View file @86fff94
@@ -28,13 +28,6 @@ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) { @@ -28,13 +28,6 @@ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) {
28 $sToRender .= "</tr>\n"; 28 $sToRender .= "</tr>\n";
29 $sToRender .= "<table>\n"; 29 $sToRender .= "<table>\n";
30 30
31 - /*$sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";  
32 - $sToRender .= "function validateForm(theForm) {\n";  
33 - $sToRender .= "\tif (!(confirmMsg('Are you sure you wish to delete this folder collaboration step?'))) {\n";  
34 - $sToRender .= "\t\treturn false;\n\t}\n";  
35 - $sToRender .= "return true;\n}\n";  
36 - $sToRender .= "//-->\n</script>\n\n";*/  
37 -  
38 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n"; 31 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
39 $sToRender .= "function validateForm(theForm) {\n"; 32 $sToRender .= "function validateForm(theForm) {\n";
40 $sToRender .= "\t return confirm('Are you sure you wish to delete this folder collaboration step?');}\n"; 33 $sToRender .= "\t return confirm('Are you sure you wish to delete this folder collaboration step?');}\n";