From f1d2bdc7ab5f5bac66c8f1ac129b69fc1dbcec54 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Wed, 22 Mar 2017 20:50:14 -0400
Subject: [PATCH] update files

---
 workflow/engine/classes/class.derivation.php   | 18 +-----------------
 .../engine/classes/model/AppDelegation.php     |  5 +----
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 16589fc30..6433852fa 100644
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -1068,23 +1068,7 @@ class Derivation
                             switch ($routeType) {
                                 case "SEC-JOIN":
                                     $arrayOpenThread = ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance)? $this->case->searchOpenPreviousTasks($currentDelegation["TAS_UID"], $currentDelegation["APP_UID"]) : array();
-
-                                    if ($flagTaskIsMultipleInstance && $flagTaskAssignTypeIsMultipleInstance && $nextDel["ROU_PREVIOUS_TYPE"] == 'SEC-JOIN') {
-                                        $appDelegation = new AppDelegation();
-                                        $arraySiblings = $appDelegation->getAllTasksBeforeSecJoin(
-                                            $nextDel["ROU_PREVIOUS_TASK"],
-                                            $currentDelegation["APP_UID"],
-                                            $appFields['DEL_PREVIOUS'],
-                                            'OPEN'
-                                        );
-                                    } else {
-                                        $arraySiblings = $this->case->getOpenSiblingThreads(
-                                            $nextDel["TAS_UID"],
-                                            $currentDelegation["APP_UID"],
-                                            $currentDelegation["DEL_INDEX"],
-                                            $currentDelegation["TAS_UID"]
-                                        );
-                                    }
+                                    $arraySiblings = $this->case->getOpenSiblingThreads($nextDel["TAS_UID"], $currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"], $currentDelegation["TAS_UID"]);
                                     if(is_array($arrayOpenThread) && is_array($arraySiblings)){
                                         $arrayOpenThread = array_merge($arrayOpenThread, $arraySiblings);
                                     }
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index d83282b14..6c95d0e57 100644
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -851,7 +851,7 @@ class AppDelegation extends BaseAppDelegation
     * @param string $sAppUid
     * @return array $index
     */
-    public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious, $threadStatus = ''){
+    public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious){
         $criteriaR = new Criteria('workflow');
         $criteriaR->addSelectColumn(AppDelegationPeer::DEL_INDEX);
         $criteriaR->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
@@ -860,9 +860,6 @@ class AppDelegation extends BaseAppDelegation
         $criteriaR->add(RoutePeer::ROU_TYPE, 'SEC-JOIN', Criteria::EQUAL);
         $criteriaR->add(AppDelegationPeer::APP_UID, $sAppUid, Criteria::EQUAL);
         $criteriaR->add(AppDelegationPeer::DEL_PREVIOUS, $sDelPrevious, Criteria::EQUAL);
-        if (!empty($threadStatus)) {
-            $criteriaR->add(AppDelegationPeer::DEL_THREAD_STATUS, $threadStatus, Criteria::EQUAL);
-        }
         $rsCriteriaR = RoutePeer::doSelectRS($criteriaR);
         $rsCriteriaR->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $index = array();