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
This commit is contained in:
Julio Cesar Laura
2014-08-22 12:41:47 -04:00
parent 9a70500096
commit ae59b6595d

View File

@@ -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))