From ae59b6595d2c2d4ec83e9c8f7f5cbf20d3110300 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 22 Aug 2014 12:41:47 -0400 Subject: [PATCH] BUG 15757 Despliegue incorrecto de los casos en "Advanced Search", para casos cancelados SOLVED - Missing condition in the cancelled criteria to get last delegation - Add missing condition --- workflow/engine/classes/model/AppCacheView.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index 9290ac54e..003a20d0b 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -672,6 +672,7 @@ class AppCacheView extends BaseAppCacheView } $criteria->add(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL); + $criteria->add(AppCacheViewPeer::DEL_LAST_INDEX, '1', Criteria::EQUAL); if (!empty($userUid)) { $criteria->add(AppCacheViewPeer::USR_UID, $userUid); @@ -1049,7 +1050,8 @@ class AppCacheView extends BaseAppCacheView )->addOr( //Cancelled - getCancelled() $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL)->addAnd( - $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "CLOSED")) + $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "CLOSED"))->addAnd( + $criteria->getNewCriterion(AppCacheViewPeer::DEL_LAST_INDEX, '1', Criteria::EQUAL)) )->addOr( $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)->addAnd( $criteria->getNewCriterion(AppCacheViewPeer::DEL_LAST_INDEX, '1', Criteria::EQUAL))