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

Merged in paulis/processmaker/HOR-2266 (pull request #5164)

Browse Source 
HOR-2266
This commit is contained in:
Paula Quispe
2016-11-18 22:48:29 +00:00
parent 373c1e8d4b 61a94a5ba5
commit 4386d186d1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,7 @@ class Derivation
* *
* @return void * @return void
*/ */
private function derivateUpdateCounters(array $arrayCurrentDelegationData, array $arrayNextDelegationData, $taskNextDelegation, array $arrayApplicationData, $delIndexNew, $aSp, $removeList) private function updateList(array $arrayCurrentDelegationData, array $arrayNextDelegationData, $taskNextDelegation, array $arrayApplicationData, $delIndexNew, $aSp, $removeList)
{ {
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
try { try {
@@ -1050,7 +1050,7 @@ class Derivation
$iNewDelIndex = $this->doDerivation($currentDelegationAux, $nextDelAux, $appFields, $aSP); $iNewDelIndex = $this->doDerivation($currentDelegationAux, $nextDelAux, $appFields, $aSP);
$this->derivateUpdateCounters($currentDelegationAux, $nextDelAux, $taskNextDel, $appFields, $iNewDelIndex, $aSP, $removeList); $this->updateList($currentDelegationAux, $nextDelAux, $taskNextDel, $appFields, $iNewDelIndex, $aSP, $removeList);
$flagUpdateCounters = false; $flagUpdateCounters = false;
$removeList = false; $removeList = false;
@@ -1182,9 +1182,8 @@ class Derivation
} }
break; break;
} }
if(!is_null($taskNextDel)){
if (!is_null($taskNextDel) && !is_null($bpmnActivityNextDel) && $flagUpdateCounters) { $this->updateList($currentDelegation, $nextDel, $taskNextDel, $appFields, (isset($iNewDelIndex))? $iNewDelIndex : 0, (isset($aSP))? $aSP : null, $removeList);
$this->derivateUpdateCounters($currentDelegation, $nextDel, $taskNextDel, $appFields, (isset($iNewDelIndex))? $iNewDelIndex : 0, (isset($aSP))? $aSP : null, $removeList);
} }
$removeList = false; $removeList = false;