fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 8027 "The process is not being imported correctly" SOLVED

Browse Source 
- update and create validations was added for route model
This commit is contained in:
Erik Amaru Ortiz
2011-11-23 12:42:32 -04:00
parent 6eabf27066
commit ac6f4ae72b
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/model/Route.php
View File

@@ -76,7 +76,14 @@ class Route extends BaseRoute {
$sRouteUID = G::generateUniqueID(); $sRouteUID = G::generateUniqueID();
$aData['ROU_UID'] = $sRouteUID; $aData['ROU_UID'] = $sRouteUID;
$oRoute = new Route(); $oRoute = new Route();
// validating default values
$aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE');
$aData['ROU_OPTIONAL'] = $this->validateValue($aData['ROU_OPTIONAL'], array('TRUE', 'FALSE'), 'FALSE');
$aData['ROU_SEND_EMAIL'] = $this->validateValue($aData['ROU_SEND_EMAIL'], array('TRUE', 'FALSE'), 'TRUE');
$oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME); $oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($oRoute->validate()) { if ($oRoute->validate()) {
$oConnection->begin(); $oConnection->begin();
$iResult = $oRoute->save(); $iResult = $oRoute->save();
@@ -110,6 +117,11 @@ class Route extends BaseRoute {
$oRoute = RoutePeer::retrieveByPK($aData['ROU_UID']); $oRoute = RoutePeer::retrieveByPK($aData['ROU_UID']);
if (!is_null($oRoute)) if (!is_null($oRoute))
{ {
// validating default values
$aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE');
$aData['ROU_OPTIONAL'] = $this->validateValue($aData['ROU_OPTIONAL'], array('TRUE', 'FALSE'), 'FALSE');
$aData['ROU_SEND_EMAIL'] = $this->validateValue($aData['ROU_SEND_EMAIL'], array('TRUE', 'FALSE'), 'TRUE');
$oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME); $oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($oRoute->validate()) { if ($oRoute->validate()) {
$oConnection->begin(); $oConnection->begin();
@@ -179,4 +191,20 @@ class Route extends BaseRoute {
} }
} }
/**
* Validate value for a variable that only accepts some determinated values
*
* @param $value string - value to test
* @param $validValues array - list of valid values
* @param $default string default value, if the tested value is not valid the default value is returned
* @return the tested and accepted value
*/
function validateValue($value, $validValues, $default)
{
if (!in_array($value, $validValues)) {
$value = $default;
}
return $value;
}
} // Route } // Route