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

I added some validations by PM-1544

Browse Source
This commit is contained in:
Paula V. Quispe
2015-02-23 11:09:57 -04:00
parent 5d79aa0d46
commit fb5562fc72
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.derivation.php
View File

@@ -176,14 +176,14 @@ class Derivation
} }
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$flagDefault = false;
while ($rsCriteria->next()) { while ($rsCriteria->next()) {
$arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData); $arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData);
if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) { if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
$arrayNextTaskDefault = $arrayRouteData; $arrayNextTaskDefault = $arrayRouteData;
$arrayNextTask = array(); $flagDefault = true;
break; continue;
} }
$flagContinue = true; $flagContinue = true;
@@ -216,7 +216,9 @@ class Derivation
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData);
} }
} }
if($flagDefault && !$flagContinue){
$arrayNextTask = array();
}
if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) {
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault);
} }