Commit d8facb3f17b9016650dea1e691d91812b72aacee
1 parent
bfd542b3
controllerRedirect and show edit folder section integration and typos
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2223 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
4 additions
and
7 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsBL.php
| @@ -47,10 +47,10 @@ if (checkSession()) { | @@ -47,10 +47,10 @@ if (checkSession()) { | ||
| 47 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); | 47 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); |
| 48 | $main->setCentralPayload($oPatternCustom); | 48 | $main->setCentralPayload($oPatternCustom); |
| 49 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForAdd=1"); | 49 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForAdd=1"); |
| 50 | - $main->setErrorMessage("An error occured attempting to store the depedant document"); | 50 | + $main->setErrorMessage("An error occured attempting to store the dependant document"); |
| 51 | $main->render(); | 51 | $main->render(); |
| 52 | } else { | 52 | } else { |
| 53 | - redirect("$default->rootUrl/control.php?action=viewDependantDocument&fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID"); | 53 | + controllerRedirect("viewDependantDocument", "fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID"); |
| 54 | } | 54 | } |
| 55 | } else if (isset($fForAdd)) { | 55 | } else if (isset($fForAdd)) { |
| 56 | //we are adding a new dependant document | 56 | //we are adding a new dependant document |
| @@ -62,7 +62,7 @@ if (checkSession()) { | @@ -62,7 +62,7 @@ if (checkSession()) { | ||
| 62 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); | 62 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); |
| 63 | $main->setCentralPayload($oPatternCustom); | 63 | $main->setCentralPayload($oPatternCustom); |
| 64 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForAdd=1"); | 64 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForAdd=1"); |
| 65 | - $main->setErrorMessage("You cannot add a new depedant document as there is currently a document in this folder undergoing collaboration"); | 65 | + $main->setErrorMessage("You cannot add a new dependant document as there is currently a document in this folder undergoing collaboration"); |
| 66 | $main->render(); | 66 | $main->render(); |
| 67 | 67 | ||
| 68 | } else { | 68 | } else { |
| @@ -85,7 +85,7 @@ if (checkSession()) { | @@ -85,7 +85,7 @@ if (checkSession()) { | ||
| 85 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); | 85 | $oPatternCustom->setHtml(getViewPage($fFolderCollaborationID, $fFolderID)); |
| 86 | $main->setCentralPayload($oPatternCustom); | 86 | $main->setCentralPayload($oPatternCustom); |
| 87 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForUpdate=1"); | 87 | $main->setFormAction($_SERVER["PHP_SELF"] . "?fFolderID=$fFolderID&fFolderCollaborationID=$fFolderCollaborationID&fForUpdate=1"); |
| 88 | - $main->setErrorMessage("You cannot add a new depedant document as there is currently a document in this folder undergoing collaboration"); | 88 | + $main->setErrorMessage("You cannot add a new dependant document as there is currently a document in this folder undergoing collaboration"); |
| 89 | $main->render(); | 89 | $main->render(); |
| 90 | 90 | ||
| 91 | } else { | 91 | } else { |
| @@ -127,8 +127,5 @@ if (checkSession()) { | @@ -127,8 +127,5 @@ if (checkSession()) { | ||
| 127 | redirect($default->root_url . "/control.php"); | 127 | redirect($default->root_url . "/control.php"); |
| 128 | } | 128 | } |
| 129 | } | 129 | } |
| 130 | - | ||
| 131 | - | ||
| 132 | } | 130 | } |
| 133 | - | ||
| 134 | ?> | 131 | ?> |
| 135 | \ No newline at end of file | 132 | \ No newline at end of file |