Peter M. Groen / knowledgetree

Commit 8a79bb39b027f1998020e7e5cf27ac6242bd99c3

Authored by Neil Blakey-Milner
1 parent 082ef09f

Use the built-in dispatcher validator 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3753 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 33 additions and 33 deletions
presentation/lookAndFeel/knowledgeTree/administration/workflow/workflows.php
  View file @8a79bb3
@@ -31,8 +31,8 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -31,8 +31,8 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
31 function do_editWorkflow() { 31 function do_editWorkflow() {
32 // $oTemplating =& KTTemplating::getSingleton(); 32 // $oTemplating =& KTTemplating::getSingleton();
33 // $oTemplate =& $oTemplating->loadTemplate('ktcore/workflow/editWorkflow'); 33 // $oTemplate =& $oTemplating->loadTemplate('ktcore/workflow/editWorkflow');
34 - $oTemplate =& KTDispatcherValidation::validateTemplate($this, 'ktcore/workflow/editWorkflow');  
35 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']); 34 + $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/editWorkflow');
  35 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
36 $oTemplate->setData(array( 36 $oTemplate->setData(array(
37 'oWorkflow' => $oWorkflow, 37 'oWorkflow' => $oWorkflow,
38 'aStates' => KTWorkflowState::getByWorkflow($oWorkflow), 38 'aStates' => KTWorkflowState::getByWorkflow($oWorkflow),
@@ -47,7 +47,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -47,7 +47,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
47 47
48 // {{{ do_saveWorkflow 48 // {{{ do_saveWorkflow
49 function do_saveWorkflow() { 49 function do_saveWorkflow() {
50 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']); 50 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
51 $oWorkflow->setName($_REQUEST['fName']); 51 $oWorkflow->setName($_REQUEST['fName']);
52 $oWorkflow->setHumanName($_REQUEST['fName']); 52 $oWorkflow->setHumanName($_REQUEST['fName']);
53 if (!empty($_REQUEST['fStartStateId'])) { 53 if (!empty($_REQUEST['fStartStateId'])) {
@@ -56,7 +56,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -56,7 +56,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
56 $oWorkflow->setStartStateId(null); 56 $oWorkflow->setStartStateId(null);
57 } 57 }
58 $res = $oWorkflow->update(); 58 $res = $oWorkflow->update();
59 - KTDispatcherValidation::notErrorFalse($this, $res, array( 59 + $this->oValidator->notErrorFalse($res, array(
60 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()), 60 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()),
61 'message' => 'Error saving workflow', 61 'message' => 'Error saving workflow',
62 )); 62 ));
@@ -71,7 +71,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -71,7 +71,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
71 'name' => $_REQUEST['fName'], 71 'name' => $_REQUEST['fName'],
72 'humanname' => $_REQUEST['fName'], 72 'humanname' => $_REQUEST['fName'],
73 )); 73 ));
74 - KTDispatcherValidation::notError($this, $res, array( 74 + $this->oValidator->notError($res, array(
75 'redirect_to' => array('main'), 75 'redirect_to' => array('main'),
76 'message' => 'Could not create workflow', 76 'message' => 'Could not create workflow',
77 )); 77 ));
@@ -82,9 +82,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -82,9 +82,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
82 82
83 // {{{ do_setWorkflowActions 83 // {{{ do_setWorkflowActions
84 function do_setWorkflowActions() { 84 function do_setWorkflowActions() {
85 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']); 85 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
86 $res = KTWorkflowUtil::setControlledActionsForWorkflow($oWorkflow, $_REQUEST['fActions']); 86 $res = KTWorkflowUtil::setControlledActionsForWorkflow($oWorkflow, $_REQUEST['fActions']);
87 - KTDispatcherValidation::notErrorFalse($this, $res, array( 87 + $this->oValidator->notErrorFalse($res, array(
88 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()), 88 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()),
89 'message' => 'Error saving workflow controlled actions', 89 'message' => 'Error saving workflow controlled actions',
90 )); 90 ));
@@ -99,13 +99,13 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -99,13 +99,13 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
99 // 99 //
100 // {{{ do_newState 100 // {{{ do_newState
101 function do_newState() { 101 function do_newState() {
102 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']); 102 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
103 $oState = KTWorkflowState::createFromArray(array( 103 $oState = KTWorkflowState::createFromArray(array(
104 'workflowid' => $oWorkflow->getId(), 104 'workflowid' => $oWorkflow->getId(),
105 'name' => $_REQUEST['fName'], 105 'name' => $_REQUEST['fName'],
106 'humanname' => $_REQUEST['fName'], 106 'humanname' => $_REQUEST['fName'],
107 )); 107 ));
108 - KTDispatcherValidation::notError($this, $oState, array( 108 + $this->oValidator->notError($oState, array(
109 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()), 109 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()),
110 'message' => 'Could not create workflow state', 110 'message' => 'Could not create workflow state',
111 )); 111 ));
@@ -116,9 +116,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -116,9 +116,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
116 116
117 // {{{ do_editState 117 // {{{ do_editState
118 function do_editState() { 118 function do_editState() {
119 - $oTemplate =& KTDispatcherValidation::validateTemplate($this, 'ktcore/workflow/editState');  
120 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
121 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fStateId']); 119 + $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/editState');
  120 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  121 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fStateId']);
122 $aTransitionsTo =& KTWorkflowTransition::getByTargetState($oState); 122 $aTransitionsTo =& KTWorkflowTransition::getByTargetState($oState);
123 $aTransitionIdsTo = array(); 123 $aTransitionIdsTo = array();
124 foreach ($aTransitionsTo as $oTransition) { 124 foreach ($aTransitionsTo as $oTransition) {
@@ -147,12 +147,12 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -147,12 +147,12 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
147 147
148 // {{{ do_saveState 148 // {{{ do_saveState
149 function do_saveState() { 149 function do_saveState() {
150 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
151 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fStateId']); 150 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  151 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fStateId']);
152 $oState->setName($_REQUEST['fName']); 152 $oState->setName($_REQUEST['fName']);
153 $oState->setHumanName($_REQUEST['fName']); 153 $oState->setHumanName($_REQUEST['fName']);
154 $res = $oState->update(); 154 $res = $oState->update();
155 - KTDispatcherValidation::notErrorFalse($this, $res, array( 155 + $this->oValidator->notErrorFalse($res, array(
156 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' . $oState->getId()), 156 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' . $oState->getId()),
157 'message' => 'Error saving state', 157 'message' => 'Error saving state',
158 )); 158 ));
@@ -163,10 +163,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -163,10 +163,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
163 163
164 // {{{ do_saveTransitions 164 // {{{ do_saveTransitions
165 function do_saveTransitions() { 165 function do_saveTransitions() {
166 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
167 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fStateId']); 166 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  167 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fStateId']);
168 $res = KTWorkflowUtil::saveTransitionsFrom($oState, $_REQUEST['fTransitionIds']); 168 $res = KTWorkflowUtil::saveTransitionsFrom($oState, $_REQUEST['fTransitionIds']);
169 - KTDispatcherValidation::notErrorFalse($this, $res, array( 169 + $this->oValidator->notErrorFalse($res, array(
170 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' . $oState->getId()), 170 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' . $oState->getId()),
171 'message' => 'Error saving transitions', 171 'message' => 'Error saving transitions',
172 )); 172 ));
@@ -177,10 +177,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -177,10 +177,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
177 177
178 // {{{ do_setStateActions 178 // {{{ do_setStateActions
179 function do_setStateActions() { 179 function do_setStateActions() {
180 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
181 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fStateId']); 180 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  181 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fStateId']);
182 $res = KTWorkflowUtil::setEnabledActionsForState($oState, $_REQUEST['fActions']); 182 $res = KTWorkflowUtil::setEnabledActionsForState($oState, $_REQUEST['fActions']);
183 - KTDispatcherValidation::notErrorFalse($this, $res, array( 183 + $this->oValidator->notErrorFalse($res, array(
184 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId(), '&fStateId=' . $oState->getId()), 184 'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId(), '&fStateId=' . $oState->getId()),
185 'message' => 'Error saving state enabled actions', 185 'message' => 'Error saving state enabled actions',
186 )); 186 ));
@@ -194,9 +194,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -194,9 +194,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
194 // 194 //
195 // {{{ do_newTransition 195 // {{{ do_newTransition
196 function do_newTransition() { 196 function do_newTransition() {
197 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
198 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fTargetStateId']);  
199 - $oPermission =& KTDispatcherValidation::validatePermission($this, $_REQUEST['fPermissionId']); 197 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  198 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fTargetStateId']);
  199 + $oPermission =& $this->oValidator->validatePermission($_REQUEST['fPermissionId']);
200 $res = KTWorkflowTransition::createFromArray(array( 200 $res = KTWorkflowTransition::createFromArray(array(
201 'workflowid' => $oWorkflow->getId(), 201 'workflowid' => $oWorkflow->getId(),
202 'name' => $_REQUEST['fName'], 202 'name' => $_REQUEST['fName'],
@@ -204,7 +204,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -204,7 +204,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
204 'targetstateid' => $oState->getId(), 204 'targetstateid' => $oState->getId(),
205 'guardpermissionid' => $oPermission->getId(), 205 'guardpermissionid' => $oPermission->getId(),
206 )); 206 ));
207 - KTDispatcherValidation::notError($this, $res, array( 207 + $this->oValidator->notError($res, array(
208 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()), 208 'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()),
209 'message' => 'Could not create workflow transition', 209 'message' => 'Could not create workflow transition',
210 )); 210 ));
@@ -215,9 +215,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -215,9 +215,9 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
215 215
216 // {{{ do_editTransition 216 // {{{ do_editTransition
217 function do_editTransition() { 217 function do_editTransition() {
218 - $oTemplate =& KTDispatcherValidation::validateTemplate($this, 'ktcore/workflow/editTransition');  
219 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
220 - $oTransition =& KTDispatcherValidation::validateWorkflowTransition($this, $_REQUEST['fTransitionId']); 218 + $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/editTransition');
  219 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  220 + $oTransition =& $this->oValidator->validateWorkflowTransition($_REQUEST['fTransitionId']);
221 $oTemplate->setData(array( 221 $oTemplate->setData(array(
222 'oWorkflow' => $oWorkflow, 222 'oWorkflow' => $oWorkflow,
223 'oTransition' => $oTransition, 223 'oTransition' => $oTransition,
@@ -230,10 +230,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -230,10 +230,10 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
230 230
231 // {{{ do_saveTransition 231 // {{{ do_saveTransition
232 function do_saveTransition() { 232 function do_saveTransition() {
233 - $oWorkflow =& KTDispatcherValidation::validateWorkflow($this, $_REQUEST['fWorkflowId']);  
234 - $oTransition =& KTDispatcherValidation::validateWorkflowTransition($this, $_REQUEST['fTransitionId']);  
235 - $oState =& KTDispatcherValidation::validateWorkflowState($this, $_REQUEST['fTargetStateId']);  
236 - $oPermission =& KTDispatcherValidation::validatePermission($this, $_REQUEST['fPermissionId']); 233 + $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  234 + $oTransition =& $this->oValidator->validateWorkflowTransition($_REQUEST['fTransitionId']);
  235 + $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fTargetStateId']);
  236 + $oPermission =& $this->oValidator->validatePermission($_REQUEST['fPermissionId']);
237 $oTransition->updateFromArray(array( 237 $oTransition->updateFromArray(array(
238 'workflowid' => $oWorkflow->getId(), 238 'workflowid' => $oWorkflow->getId(),
239 'name' => $_REQUEST['fName'], 239 'name' => $_REQUEST['fName'],
@@ -242,7 +242,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher { @@ -242,7 +242,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
242 'guardpermissionid' => $oPermission->getId(), 242 'guardpermissionid' => $oPermission->getId(),
243 )); 243 ));
244 $res = $oTransition->update(); 244 $res = $oTransition->update();
245 - KTDispatcherValidation::notErrorFalse($this, $res, array( 245 + $this->oValidator->notErrorFalse($res, array(
246 'redirect_to' => array('editTransition', 'fWorkflowId=' . $oWorkflow->getId() . '&fTransitionId=' . $oTransition->getId()), 246 'redirect_to' => array('editTransition', 'fWorkflowId=' . $oWorkflow->getId() . '&fTransitionId=' . $oTransition->getId()),
247 'message' => 'Error saving transition', 247 'message' => 'Error saving transition',
248 )); 248 ));