Peter M. Groen / knowledgetree

Commit 0a60a61f90ceea2bc7effdccda286ff8992872ac

Authored by michael
1 parent d61e2d30

incorporated showing a particular section on the document details page 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2207 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php
  View file @0a60a61
... ... @@ -43,12 +43,12 @@ if (checkSession()) {
43 43 if ($fIsActive) {
44 44 //if the document collaboration step the user is attempting to edit is underway, you may not edit it
45 45 //so bounce the user back to the document view page and display an error message
46   - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0");
  46 + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting&fCollaborationEdit=0");
47 47 }
48 48 if ($fIsDone) {
49 49 //the user is attempting to edit a step in the document collaboration process that has already been done
50 50 //so bounce the user back to the document view page and display an error message
51   - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fCollaborationEdit=0");
  51 + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting&fCollaborationEdit=0");
52 52 }
53 53 if (isset($fForStore)) {
54 54 //if we are storing, get the folder collaboration entry from the database
... ... @@ -86,7 +86,7 @@ if (checkSession()) {
86 86 $oEmail->send($oUser->getEmail(), "Assigment of role in document collaboration process", $sBody, $default->owl_email_from, $default->owl_email_fromname);
87 87  
88 88 //go back to the document view page
89   - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID");
  89 + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting");
90 90 } else {
91 91 //the user may have been unassigned and no new user assigned
92 92 //if this is true, delete the folder_user_role_link
... ... @@ -95,7 +95,7 @@ if (checkSession()) {
95 95 $oFolderUserRole->delete();
96 96 }
97 97 //go back to the document view page
98   - redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID");
  98 + controllerRedirect("viewDocument", "fDocumentID=$fDocumentID&fShowSection=documentRouting");
99 99 }
100 100 } else {
101 101 //we're still browsing, so just display the document routing details
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php
  View file @0a60a61
... ... @@ -33,7 +33,7 @@ if (checkSession()) {
33 33 if (isset($fFirstEdit)) {
34 34 $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=modifyDocumentTypeMetaData&fDocumentID=$fDocumentID&fFirstEdit=1"));
35 35 } else {
36   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"));
  36 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fShowSection=genericMetaData"));
37 37 }
38 38 $main->setHasRequiredFields(true);
39 39 $main->render();
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php
  View file @0a60a61
... ... @@ -27,7 +27,7 @@ if (checkSession()) {
27 27 $oPatternCustom = & new PatternCustom();
28 28 $oPatternCustom->setHtml(getPage($fDocumentID, $oDocument->getDocumentTypeID(), $fFirstEdit));
29 29 $main->setCentralPayload($oPatternCustom);
30   - $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID"));
  30 + $main->setFormAction("../store.php?fReturnURL=" . urlencode("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID&fShowSection=typeSpecificMetaData"));
31 31 $main->setHasRequiredFields(true);
32 32 $main->render();
33 33 }
... ...