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

Merged in paulis/processmaker/HOR-2280 (pull request #5184)

Browse Source 
HOR-2280
This commit is contained in:
Paula Quispe
2016-11-23 21:45:15 +00:00
parent 2d37e9d8c1 50d34181a0
commit c72c3eafb6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -917,7 +917,7 @@ class Derivation
$flagTaskNextDelAssignTypeIsMultipleInstance = preg_match("/^(?:MULTIPLE_INSTANCE|MULTIPLE_INSTANCE_VALUE_BASED)$/", $taskNextDel->getTasAssignType()); $flagTaskNextDelAssignTypeIsMultipleInstance = preg_match("/^(?:MULTIPLE_INSTANCE|MULTIPLE_INSTANCE_VALUE_BASED)$/", $taskNextDel->getTasAssignType());
} }
$flagUpdateCounters = true; $flagUpdateList = true;
switch ($nextDel['TAS_UID']) { switch ($nextDel['TAS_UID']) {
case TASK_FINISH_PROCESS: case TASK_FINISH_PROCESS:
@@ -1052,7 +1052,7 @@ class Derivation
$this->updateList($currentDelegationAux, $nextDelAux, $taskNextDel, $appFields, $iNewDelIndex, $aSP, $removeList); $this->updateList($currentDelegationAux, $nextDelAux, $taskNextDel, $appFields, $iNewDelIndex, $aSP, $removeList);
$flagUpdateCounters = false; $flagUpdateList = false;
$removeList = false; $removeList = false;
$arrayDerivationResult[] = ['DEL_INDEX' => $iNewDelIndex, 'TAS_UID' => $nextDelAux['TAS_UID'], 'USR_UID' => (isset($nextDelAux['USR_UID']))? $nextDelAux['USR_UID'] : '']; $arrayDerivationResult[] = ['DEL_INDEX' => $iNewDelIndex, 'TAS_UID' => $nextDelAux['TAS_UID'], 'USR_UID' => (isset($nextDelAux['USR_UID']))? $nextDelAux['USR_UID'] : ''];
@@ -1182,7 +1182,8 @@ class Derivation
} }
break; break;
} }
if(!is_null($taskNextDel)){ //$flagUpdateList is updated when is parallel
if(!is_null($taskNextDel) && $flagUpdateList){
$this->updateList($currentDelegation, $nextDel, $taskNextDel, $appFields, (isset($iNewDelIndex))? $iNewDelIndex : 0, (isset($aSP))? $aSP : null, $removeList); $this->updateList($currentDelegation, $nextDel, $taskNextDel, $appFields, (isset($iNewDelIndex))? $iNewDelIndex : 0, (isset($aSP))? $aSP : null, $removeList);
} }