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

HOR-647

Browse Source
This commit is contained in:
Paula V. Quispe
2016-03-30 16:27:27 -04:00
parent eadca40d08
commit 3c3a147e29
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.case.php
View File

@@ -1560,8 +1560,8 @@ class Cases
$pausedTask[] = $row; $pausedTask[] = $row;
} }
if (count($pausedTask) == 0) { if (count($pausedTask) === 0) {
return false; // return false because there is not any delegation for this task. return array(); // return false because there is not any delegation for this task.
} else { } else {
return array('pause' => $pausedTask); return array('pause' => $pausedTask);
} }

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

@@ -1129,8 +1129,12 @@ class Derivation
switch ($routeType) { switch ($routeType) {
case "SEC-JOIN": case "SEC-JOIN":
$arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array(); $arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array();
$arrayOpenThread = array_merge($arrayOpenThread, $this->case->getOpenSiblingThreads($nextDel["TAS_UID"], $currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"], $currentDelegation["TAS_UID"])); $arraySiblings = $this->case->getOpenSiblingThreads($nextDel["TAS_UID"], $currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"], $currentDelegation["TAS_UID"]);
if(is_array($arrayOpenThread) && is_array($arraySiblings)){
$arrayOpenThread = array_merge($arrayOpenThread, $arraySiblings);
}
$canDerivate = empty($arrayOpenThread); $canDerivate = empty($arrayOpenThread);
break; break;
default: default:
$canDerivate = true; $canDerivate = true;