From ce3de33b0e8bd2d748699e7df82ae802c90ac19f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Mon, 12 Jun 2017 16:41:09 -0400 Subject: [PATCH] HOR-3388 --- workflow/engine/classes/class.case.php | 6 ++++-- workflow/engine/src/ProcessMaker/BusinessModel/Light.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index c90bd8b66..f3e86d31a 100644 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -3347,7 +3347,7 @@ class Cases * @return integer */ - public function getCurrentDelegation($sApplicationUID = '', $sUserUID = '') + public function getCurrentDelegation($sApplicationUID = '', $sUserUID = '', $onlyOpenThreads = false) { $oCriteria = new Criteria(); $oCriteria->add(AppDelegationPeer::APP_UID, $sApplicationUID); @@ -3362,7 +3362,9 @@ class Cases //if the user is not in the task, we need to return a valid del index, so we are returning the latest delindex $oCriteria = new Criteria(); $oCriteria->add(AppDelegationPeer::APP_UID, $sApplicationUID); - $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN'); + if ($onlyOpenThreads) { + $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN'); + } $oCriteria->addDescendingOrderByColumn(AppDelegationPeer::DEL_DELEGATE_DATE); $oApplication = AppDelegationPeer::doSelectOne($oCriteria); if (!is_null($oApplication)) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index 29e81e66c..a38ed600d 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -1013,7 +1013,7 @@ class Light { $response = array("status" => "fail"); $oCase = new \Cases(); - $iDelIndex = $oCase->getCurrentDelegation( $sAppUid, '' ); + $iDelIndex = $oCase->getCurrentDelegation( $sAppUid, '', true ); $oAppDelegation = new \AppDelegation(); $aDelegation = $oAppDelegation->load( $sAppUid, $iDelIndex );