From 4d390a53b89d9f2037c341af208afcdff5a23195 Mon Sep 17 00:00:00 2001
From: william barra <dheeyi@gmail.com>
Date: Fri, 11 Mar 2016 12:20:15 -0400
Subject: [PATCH] HOR-421 Conexion de Inclusive Gateway a exclusive gateway no
 esta funcionando

HOR-421
---
 .../ProcessMaker/Project/Adapter/BpmnWorkflow.php   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 137cb755c..225b74271 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -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);