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

Merged in paulis/processmaker/HOR-1659 (pull request #4802)

Browse Source 
HOR-1659
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-22 17:54:05 -04:00
parent 6533c5a008 171ece5ff0
commit f786db66b3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -272,7 +272,10 @@ class Derivation
foreach ($arrayAux as $value2) { foreach ($arrayAux as $value2) {
$key = ++$i; $key = ++$i;
$arrayNextTask[$key] = $value2; $arrayNextTask[$key] = $value2;
$prefix = substr($value['ROU_NEXT_TASK'], 0, 4);
if($prefix!=='gtg-'){
$arrayNextTask[$key]['SOURCE_UID'] = $value['ROU_NEXT_TASK']; $arrayNextTask[$key]['SOURCE_UID'] = $value['ROU_NEXT_TASK'];
}
foreach($aSecJoin as $rsj){ foreach($aSecJoin as $rsj){
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"]; $arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"];
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TYPE"] = "SEC-JOIN"; $arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TYPE"] = "SEC-JOIN";
@@ -286,7 +289,10 @@ class Derivation
) { ) {
$arrayNextTaskData["NEXT_TASK"]["TAS_UID"] = $arrayNextTaskData["TAS_UID"] . "/" . $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]; $arrayNextTaskData["NEXT_TASK"]["TAS_UID"] = $arrayNextTaskData["TAS_UID"] . "/" . $arrayNextTaskData["NEXT_TASK"]["TAS_UID"];
} }
$prefix = substr($value['ROU_NEXT_TASK'], 0, 4);
if($prefix!=='gtg-'){
$arrayNextTaskData['SOURCE_UID'] = $value['ROU_NEXT_TASK']; $arrayNextTaskData['SOURCE_UID'] = $value['ROU_NEXT_TASK'];
}
$arrayNextTask[++$i] = $arrayNextTaskData; $arrayNextTask[++$i] = $arrayNextTaskData;
foreach($aSecJoin as $rsj){ foreach($aSecJoin as $rsj){
$arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"]; $arrayNextTask[$i]["NEXT_TASK"]["ROU_PREVIOUS_TASK"] = $rsj["ROU_PREVIOUS_TASK"];