From c302c2610cf2a6c19f349810254be7a6276d3974 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Fri, 20 Jun 2003 15:21:06 +0000 Subject: [PATCH] controllerRedirect and show edit folder section integration --- presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php | 4 ++-- presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php | 4 ++-- presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php index 645dbac..473495e 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php @@ -34,7 +34,7 @@ if (checkSession()) { } else { $oFolderDocType = & new FolderDocTypeLink($fFolderID,$fDocumentTypeID); if ($oFolderDocType->create()) { - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes"); } else { //error creating document in the db require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php index 3ad1370..47d8af7 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php @@ -38,8 +38,8 @@ if (checkSession()) { // check if exists for the fFolderID, fGroupID combination if (!$oGroupFolderLink->exists()) { if ($oGroupFolderLink->create()) { - // on successful creation, redirect to the folder edit page - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + // on successful creation, redirect to the folder edit page + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); } else { //otherwise display an error message $sErrorMessage = "The folder access entry could not be created in the database"; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php index b9b9186..b3dc42f 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php @@ -38,7 +38,7 @@ if (checkSession()) { } $oFolderCollaboration->setSequenceNumber($fSequenceNumber); $oFolderCollaboration->update(); - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting"); } else { $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID); if ($oFolderCollaboration->hasDocumentInProcess()) { diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php index 9349136..7a9540c 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php @@ -30,7 +30,7 @@ if (checkSession()) { if ($oFolderCollaboration->delete()) { //on successful deletion, redirect to the folder edit page include_once("$default->fileSystemRoot/presentation/Html.inc"); - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting"); } else { //otherwise display an error message include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); @@ -55,7 +55,7 @@ if (checkSession()) { if ($oFolderCollaboration->hasDocumentInProcess()) { //can't delete a step in the folder collaboration process if there is a document //currently undergoing the process - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID&fCollaborationDelete=0"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting&fCollaborationDelete=0"); } else { //display the browse page include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php index f7a101c..bb3e1ed 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php @@ -44,7 +44,7 @@ if (checkSession()) { //go ahead and delete $oFolderDocTypeLink = FolderDocTypeLink::get($fFolderDocTypeID); if ($oFolderDocTypeLink->delete()) { - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes"); } else { //there was a problem deleting from the database require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php index 3d668a1..a4ad61e 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php @@ -39,7 +39,7 @@ if (checkSession()) { $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID); if ($oGroupFolderLink->delete()) { // on successful deletion, redirect to the folder edit page - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); } else { // otherwise display an error message $sErrorMessage = "The folder access entry could not be deleted from the database"; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php index afc61dc..cf4b4e6 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php @@ -41,8 +41,8 @@ if (checkSession()) { $oGroupFolderLink->setCanRead($fCanRead); $oGroupFolderLink->setCanWrite($fCanWrite); if ($oGroupFolderLink->update()) { - // on successful deletion, redirect to the folder edit page - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); + // on successful update, redirect to the folder edit page + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions"); } else { // otherwise display an error message $sErrorMessage = "The folder access entry could not be deleted from the database"; -- libgit2 0.21.4