Merge branch 'master' of git://github.com/colosa/processmaker into BUG-15394
This commit is contained in:
@@ -1051,8 +1051,8 @@ class AppCacheView extends BaseAppCacheView
|
||||
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL)->addAnd(
|
||||
$criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "CLOSED"))
|
||||
)->addOr(
|
||||
//Completed - getCompleted()
|
||||
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)
|
||||
$criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL)->addAnd(
|
||||
$criteria->getNewCriterion(AppCacheViewPeer::DEL_LAST_INDEX, '1', Criteria::EQUAL))
|
||||
);
|
||||
|
||||
if (!$doCount) {
|
||||
|
||||
Reference in New Issue
Block a user