From 0a60a61f90ceea2bc7effdccda286ff8992872ac Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 20 Jun 2003 09:13:21 +0000 Subject: [PATCH] incorporated showing a particular section on the document details page --- presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php | 8 ++++---- presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php index ae168b8..d205efc 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php @@ -43,12 +43,12 @@ if (checkSession()) { if ($fIsActive) { //if the document collaboration step the user is attempting to edit is underway, you may not edit it //so bounce the user back to the document view page and display an error message - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0"); + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting&fCollaborationEdit=0"); } if ($fIsDone) { //the user is attempting to edit a step in the document collaboration process that has already been done //so bounce the user back to the document view page and display an error message - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0"); + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting&fCollaborationEdit=0"); } if (isset($fForStore)) { //if we are storing, get the folder collaboration entry from the database @@ -86,7 +86,7 @@ if (checkSession()) { $oEmail->send($oUser->getEmail(), "Assigment of role in document collaboration process", $sBody, $default->owl_email_from, $default->owl_email_fromname); //go back to the document view page - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"); + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting"); } else { //the user may have been unassigned and no new user assigned //if this is true, delete the folder_user_role_link @@ -95,7 +95,7 @@ if (checkSession()) { $oFolderUserRole->delete(); } //go back to the document view page - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"); + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting"); } } else { //we're still browsing, so just display the document routing details diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php index 21585ea..821e710 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php @@ -33,7 +33,7 @@ if (checkSession()) { if (isset($fFirstEdit)) { $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=modifyDocumentTypeMetaData&fDocumentID=$fDocumentID&fFirstEdit=1")); } else { - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID")); + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fShowSection=genericMetaData")); } $main->setHasRequiredFields(true); $main->render(); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php index d932542..29b95ed 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php @@ -27,7 +27,7 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml(getPage($fDocumentID, $oDocument->getDocumentTypeID(), $fFirstEdit)); $main->setCentralPayload($oPatternCustom); - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID")); + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fShowSection=typeSpecificMetaData")); $main->setHasRequiredFields(true); $main->render(); } -- libgit2 0.21.4