Commit c0225ebf83d23b2de4f3f34b74dfab5a48383376
1 parent
25f260bf
no message
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@857 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
6 additions
and
2 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderBL.php
| ... | ... | @@ -38,6 +38,7 @@ if (checkSession()) { |
| 38 | 38 | } |
| 39 | 39 | $main->setCentralPayload($oPatternCustom); |
| 40 | 40 | $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); |
| 41 | + $main->setHasRequiredFields(true); | |
| 41 | 42 | $main->render(); |
| 42 | 43 | } else { |
| 43 | 44 | //have a folder name to store |
| ... | ... | @@ -53,6 +54,7 @@ if (checkSession()) { |
| 53 | 54 | $oPatternCustom->setHtml(renderBrowseAddPage($fFolderID)); |
| 54 | 55 | $main->setCentralPayload($oPatternCustom); |
| 55 | 56 | $main->setErrorMessage("There is another folder named $fFolderName in this folder already"); |
| 57 | + $main->setHasRequiredFields(true); | |
| 56 | 58 | $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); |
| 57 | 59 | $main->render(); |
| 58 | 60 | } else { |
| ... | ... | @@ -62,7 +64,7 @@ if (checkSession()) { |
| 62 | 64 | if ($oFolder->create()) { |
| 63 | 65 | //create the folder on the file system |
| 64 | 66 | if (PhysicalFolderManagement::createFolder(Folder::getFolderPath($oFolder->getID()))) { |
| 65 | - redirect("$default->owl_root_url/control.php?action=browse&fBrowseType=folder&fFolderID=" . $oFolder->getID()); | |
| 67 | + redirect("$default->owl_root_url/control.php?action=editFolder&fFolderID=" . $oFolder->getID()); | |
| 66 | 68 | } else { |
| 67 | 69 | //if we couldn't do that, remove the folder from the db and report and error |
| 68 | 70 | $oFolder->delete(); |
| ... | ... | @@ -71,6 +73,7 @@ if (checkSession()) { |
| 71 | 73 | $main->setCentralPayload($oPatternCustom); |
| 72 | 74 | $main->setErrorMessage("There was an error creating the folder $fFolderName on the filesystem"); |
| 73 | 75 | $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); |
| 76 | + $main->setHasRequiredFields(true); | |
| 74 | 77 | $main->render(); |
| 75 | 78 | } |
| 76 | 79 | } else { |
| ... | ... | @@ -79,7 +82,7 @@ if (checkSession()) { |
| 79 | 82 | $oPatternCustom->setHtml(renderBrowsePage($fFolderID)); |
| 80 | 83 | $main->setCentralPayload($oPatternCustom); |
| 81 | 84 | $main->setErrorMessage("There was an error creating the folder $fFolderName in the database"); |
| 82 | - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); | |
| 85 | + $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); | |
| 83 | 86 | $main->render(); |
| 84 | 87 | } |
| 85 | 88 | } |
| ... | ... | @@ -89,6 +92,7 @@ if (checkSession()) { |
| 89 | 92 | $oPatternCustom->setHtml(renderBrowseAddPage($fFolderID)); |
| 90 | 93 | $main->setCentralPayload($oPatternCustom); |
| 91 | 94 | $main->setErrorMessage("Folder not created. Folder names may not contain: '<', '>', '*', '/', '\', '|', '?' or '\"' "); |
| 95 | + $main->setHasRequiredFields(true); | |
| 92 | 96 | $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID"); |
| 93 | 97 | $main->render(); |
| 94 | 98 | } | ... | ... |