fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in julceslau/processmaker (pull request #705)

Browse Source 
BUG 15757 Despliegue incorrecto de los casos en "Advanced Search", para casos cancelados SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-22 12:53:40 -04:00
parent 9a70500096 ae59b6595d
commit abe6de4ed0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/AppCacheView.php
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))