Peter M. Groen / knowledgetree

Commit c302c2610cf2a6c19f349810254be7a6276d3974

Authored by Michael Joseph
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
Inline Side-by-side
Showing 7 changed files with 10 additions and 10 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeBL.php
  View file @c302c26
@@ -34,7 +34,7 @@ if (checkSession()) { @@ -34,7 +34,7 @@ if (checkSession()) {
34 } else { 34 } else {
35 $oFolderDocType = & new FolderDocTypeLink($fFolderID,$fDocumentTypeID); 35 $oFolderDocType = & new FolderDocTypeLink($fFolderID,$fDocumentTypeID);
36 if ($oFolderDocType->create()) { 36 if ($oFolderDocType->create()) {
37 - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); 37 + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes");
38 } else { 38 } else {
39 //error creating document in the db 39 //error creating document in the db
40 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 40 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
presentation/lookAndFeel/knowledgeTree/foldermanagement/addGroupFolderLinkBL.php
  View file @c302c26
@@ -38,8 +38,8 @@ if (checkSession()) { @@ -38,8 +38,8 @@ if (checkSession()) {
38 // check if exists for the fFolderID, fGroupID combination 38 // check if exists for the fFolderID, fGroupID combination
39 if (!$oGroupFolderLink->exists()) { 39 if (!$oGroupFolderLink->exists()) {
40 if ($oGroupFolderLink->create()) { 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 } else { 43 } else {
44 //otherwise display an error message 44 //otherwise display an error message
45 $sErrorMessage = "The folder access entry could not be created in the database"; 45 $sErrorMessage = "The folder access entry could not be created in the database";
presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationBL.php
  View file @c302c26
@@ -38,7 +38,7 @@ if (checkSession()) { @@ -38,7 +38,7 @@ if (checkSession()) {
38 } 38 }
39 $oFolderCollaboration->setSequenceNumber($fSequenceNumber); 39 $oFolderCollaboration->setSequenceNumber($fSequenceNumber);
40 $oFolderCollaboration->update(); 40 $oFolderCollaboration->update();
41 - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); 41 + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderRouting");
42 } else { 42 } else {
43 $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID); 43 $oFolderCollaboration = FolderCollaboration::get($fFolderCollaborationID);
44 if ($oFolderCollaboration->hasDocumentInProcess()) { 44 if ($oFolderCollaboration->hasDocumentInProcess()) {
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php
  View file @c302c26
@@ -30,7 +30,7 @@ if (checkSession()) { @@ -30,7 +30,7 @@ if (checkSession()) {
30 if ($oFolderCollaboration->delete()) { 30 if ($oFolderCollaboration->delete()) {
31 //on successful deletion, redirect to the folder edit page 31 //on successful deletion, redirect to the folder edit page
32 include_once("$default->fileSystemRoot/presentation/Html.inc"); 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 } else { 34 } else {
35 //otherwise display an error message 35 //otherwise display an error message
36 include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); 36 include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
@@ -55,7 +55,7 @@ if (checkSession()) { @@ -55,7 +55,7 @@ if (checkSession()) {
55 if ($oFolderCollaboration->hasDocumentInProcess()) { 55 if ($oFolderCollaboration->hasDocumentInProcess()) {
56 //can't delete a step in the folder collaboration process if there is a document 56 //can't delete a step in the folder collaboration process if there is a document
57 //currently undergoing the process 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 } else { 59 } else {
60 //display the browse page 60 //display the browse page
61 include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); 61 include_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderDocTypeBL.php
  View file @c302c26
@@ -44,7 +44,7 @@ if (checkSession()) { @@ -44,7 +44,7 @@ if (checkSession()) {
44 //go ahead and delete 44 //go ahead and delete
45 $oFolderDocTypeLink = FolderDocTypeLink::get($fFolderDocTypeID); 45 $oFolderDocTypeLink = FolderDocTypeLink::get($fFolderDocTypeID);
46 if ($oFolderDocTypeLink->delete()) { 46 if ($oFolderDocTypeLink->delete()) {
47 - redirect("$default->rootUrl/control.php?action=editFolder&fFolderID=$fFolderID"); 47 + controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=documentTypes");
48 } else { 48 } else {
49 //there was a problem deleting from the database 49 //there was a problem deleting from the database
50 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 50 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteGroupFolderLinkBL.php
  View file @c302c26
@@ -39,7 +39,7 @@ if (checkSession()) { @@ -39,7 +39,7 @@ if (checkSession()) {
39 $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID); 39 $oGroupFolderLink = & GroupFolderLink::get($fGroupFolderLinkID);
40 if ($oGroupFolderLink->delete()) { 40 if ($oGroupFolderLink->delete()) {
41 // on successful deletion, redirect to the folder edit page 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 } else { 43 } else {
44 // otherwise display an error message 44 // otherwise display an error message
45 $sErrorMessage = "The folder access entry could not be deleted from the database"; 45 $sErrorMessage = "The folder access entry could not be deleted from the database";
presentation/lookAndFeel/knowledgeTree/foldermanagement/editGroupFolderLinkBL.php
  View file @c302c26
@@ -41,8 +41,8 @@ if (checkSession()) { @@ -41,8 +41,8 @@ if (checkSession()) {
41 $oGroupFolderLink->setCanRead($fCanRead); 41 $oGroupFolderLink->setCanRead($fCanRead);
42 $oGroupFolderLink->setCanWrite($fCanWrite); 42 $oGroupFolderLink->setCanWrite($fCanWrite);
43 if ($oGroupFolderLink->update()) { 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 } else { 46 } else {
47 // otherwise display an error message 47 // otherwise display an error message
48 $sErrorMessage = "The folder access entry could not be deleted from the database"; 48 $sErrorMessage = "The folder access entry could not be deleted from the database";