fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-421

Browse Source 
Conexion de Inclusive Gateway a exclusive gateway no esta funcionando

HOR-421
This commit is contained in:
william barra
2016-03-11 12:20:15 -04:00
committed by dheeyi
parent b238c1f41c
commit 4d390a53b8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -717,7 +717,7 @@ class BpmnWorkflow extends Project\Bpmn
}
*/
public function createTaskByElement($elementUid, $elementType, $key, $elementUidDest="")
public function createTaskByElement($elementUid, $elementType, $key, $elementUidDest="", $routeType = '')
{
try {
$flagElementTaskRelation = false;
@@ -735,7 +735,8 @@ class BpmnWorkflow extends Project\Bpmn
$flagElementTaskRelation = false;
}
}
if ($flagElementTaskRelation) {
if ($flagElementTaskRelation || (isset($this->arrayElementTaskRelation[$elementUid]) && $routeType ===
'SEC-JOIN')) {
$taskUid = $this->arrayElementTaskRelation[$elementUid];
} else {
$taskPosX = 0;
@@ -816,7 +817,10 @@ class BpmnWorkflow extends Project\Bpmn
}
if($elementUidDest != ""){
$aElement[$elementUid][$elementUidDest] = $elementUidDest;
$aElement[$elementUid] = $elementUidDest;
if($routeType === 'SEC-JOIN'){
$this->arrayElementTaskRelation[$elementUid] = $taskUid;
}else
$this->arrayElementTaskRelation = $aElement;
}else {
//Array - Add element
@@ -911,7 +915,8 @@ class BpmnWorkflow extends Project\Bpmn
$gatewayUid,
"bpmnGateway",
"gateway-to-gateway",
$arrayFlowData["FLO_ELEMENT_DEST"]
$arrayFlowData["FLO_ELEMENT_DEST"],
$routeType
);
$result = $this->wp->addRoute($activityUid, $taskUid, $routeType, $routeCondition, $routeDefault);