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

Merged in paulis/processmaker/HOR-1359 (pull request #4492)

Browse Source 
HOR-1359
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-01 09:04:21 -04:00
parent b845062e5a 132d177841
commit 202d68dc51
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,17 +208,25 @@ class Derivation
$flagAddDelegation = $pmScript->evaluate(); $flagAddDelegation = $pmScript->evaluate();
} }
if (trim($arrayRouteData["ROU_CONDITION"]) == "" && $arrayRouteData["ROU_NEXT_TASK"] != "-1") { //In the 3.0.1.7 version we have a condition for join and the rouCondition maybe is true, 1, etc
$rouCondition = trim($arrayRouteData["ROU_CONDITION"]);
if($rouCondition !== '' && $arrayRouteData["ROU_TYPE"] === 'SEC-JOIN'){
error_log(G::LoadTranslation( 'ID_WARNING_GATEWAY_CONVERGENT_WITH_CONDITION' ).' '.$flagAddDelegation);
}
if ($arrayRouteData["ROU_NEXT_TASK"] != "-1" && $rouCondition === '') {
$arrayTaskData = $task->load($arrayRouteData["ROU_NEXT_TASK"]); $arrayTaskData = $task->load($arrayRouteData["ROU_NEXT_TASK"]);
if ($arrayRouteData["ROU_TYPE"] != "SEC-JOIN" && $arrayTaskData["TAS_TYPE"] == "GATEWAYTOGATEWAY") { if ($arrayRouteData["ROU_TYPE"] != "SEC-JOIN" && $arrayTaskData["TAS_TYPE"] == "GATEWAYTOGATEWAY") {
$flagAddDelegation = true; $flagAddDelegation = true;
} }
if($arrayRouteData["ROU_TYPE"] == "SEC-JOIN"){
$aSecJoin[$count]["ROU_PREVIOUS_TASK"] = $arrayRouteData["ROU_NEXT_TASK"];
$aSecJoin[$count]["ROU_PREVIOUS_TYPE"] = "SEC-JOIN";
$count++;
} }
//In the 3.0.1.8 version the Secjoin does not have a rouCondition
if($arrayRouteData["ROU_NEXT_TASK"] !== '-1' && $arrayRouteData["ROU_TYPE"] === 'SEC-JOIN'){
$arrayTaskData = $task->load($arrayRouteData["ROU_NEXT_TASK"]);
$aSecJoin[$count]["ROU_PREVIOUS_TASK"] = $arrayRouteData["ROU_NEXT_TASK"];
$aSecJoin[$count]["ROU_PREVIOUS_TYPE"] = 'SEC-JOIN';
$count++;
} }
if ($arrayRouteData["ROU_TYPE"] == "EVALUATE" && !empty($arrayNextTask)) { if ($arrayRouteData["ROU_TYPE"] == "EVALUATE" && !empty($arrayNextTask)) {

9
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -816,16 +816,7 @@ class BpmnWorkflow extends Project\Bpmn
} }
} }
if($elementUidDest != ""){
$aElement[$elementUid] = $elementUidDest;
if($routeType === 'SEC-JOIN'){
$this->arrayElementTaskRelation[$elementUid] = $taskUid; $this->arrayElementTaskRelation[$elementUid] = $taskUid;
}else
$this->arrayElementTaskRelation = $aElement;
}else {
//Array - Add element
$this->arrayElementTaskRelation[$elementUid] = $taskUid;
}
} }
//Return //Return