Commit c302c2610cf2a6c19f349810254be7a6276d3974
1 parent
d8facb3f
controllerRedirect and show edit folder section integration
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2224 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
7 changed files
with
10 additions
and
10 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
| ... | ... | @@ -34,7 +34,7 @@ if (checkSession()) { |
| 34 | 34 | } else { |
| 35 | 35 | $oFolderDocType = & new FolderDocTypeLink($fFolderID,$fDocumentTypeID); |
| 36 | 36 | if ($oFolderDocType->create()) { |
| 37 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 37 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes"); | |
| 38 | 38 | } else { |
| 39 | 39 | //error creating document in the db |
| 40 | 40 | require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
| ... | ... | @@ -38,8 +38,8 @@ if (checkSession()) { |
| 38 | 38 | // check if exists for the fFolderID, fGroupID combination |
| 39 | 39 | if (!$oGroupFolderLink->exists()) { |
| 40 | 40 | if ($oGroupFolderLink->create()) { |
| 41 | - // on successful creation, redirect to the folder edit page | |
| 42 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 41 | + // on successful creation, redirect to the folder edit page | |
| 42 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); | |
| 43 | 43 | } else { |
| 44 | 44 | //otherwise display an error message |
| 45 | 45 | $sErrorMessage = "The folder access entry could not be created in the database"; | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
| ... | ... | @@ -38,7 +38,7 @@ if (checkSession()) { |
| 38 | 38 | } |
| 39 | 39 | $oFolderCollaboration->setSequenceNumber($fSequenceNumber); |
| 40 | 40 | $oFolderCollaboration->update(); |
| 41 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 41 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting"); | |
| 42 | 42 | } else { |
| 43 | 43 | $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID); |
| 44 | 44 | if ($oFolderCollaboration->hasDocumentInProcess()) { | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
| ... | ... | @@ -30,7 +30,7 @@ if (checkSession()) { |
| 30 | 30 | if ($oFolderCollaboration->delete()) { |
| 31 | 31 | //on successful deletion, redirect to the folder edit page |
| 32 | 32 | include_once("$default->fileSystemRoot/presentation/Html.inc"); |
| 33 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 33 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting"); | |
| 34 | 34 | } else { |
| 35 | 35 | //otherwise display an error message |
| 36 | 36 | include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); |
| ... | ... | @@ -55,7 +55,7 @@ if (checkSession()) { |
| 55 | 55 | if ($oFolderCollaboration->hasDocumentInProcess()) { |
| 56 | 56 | //can't delete a step in the folder collaboration process if there is a document |
| 57 | 57 | //currently undergoing the process |
| 58 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID&fCollaborationDelete=0"); | |
| 58 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting&fCollaborationDelete=0"); | |
| 59 | 59 | } else { |
| 60 | 60 | //display the browse page |
| 61 | 61 | include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
| ... | ... | @@ -44,7 +44,7 @@ if (checkSession()) { |
| 44 | 44 | //go ahead and delete |
| 45 | 45 | $oFolderDocTypeLink = FolderDocTypeLink::get($fFolderDocTypeID); |
| 46 | 46 | if ($oFolderDocTypeLink->delete()) { |
| 47 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 47 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes"); | |
| 48 | 48 | } else { |
| 49 | 49 | //there was a problem deleting from the database |
| 50 | 50 | require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
| ... | ... | @@ -39,7 +39,7 @@ if (checkSession()) { |
| 39 | 39 | $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID); |
| 40 | 40 | if ($oGroupFolderLink->delete()) { |
| 41 | 41 | // on successful deletion, redirect to the folder edit page |
| 42 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 42 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); | |
| 43 | 43 | } else { |
| 44 | 44 | // otherwise display an error message |
| 45 | 45 | $sErrorMessage = "The folder access entry could not be deleted from the database"; | ... | ... |
presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
| ... | ... | @@ -41,8 +41,8 @@ if (checkSession()) { |
| 41 | 41 | $oGroupFolderLink->setCanRead($fCanRead); |
| 42 | 42 | $oGroupFolderLink->setCanWrite($fCanWrite); |
| 43 | 43 | if ($oGroupFolderLink->update()) { |
| 44 | - // on successful deletion, redirect to the folder edit page | |
| 45 | - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); | |
| 44 | + // on successful update, redirect to the folder edit page | |
| 45 | + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); | |
| 46 | 46 | } else { |
| 47 | 47 | // otherwise display an error message |
| 48 | 48 | $sErrorMessage = "The folder access entry could not be deleted from the database"; | ... | ... |