fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 7197 New feature request: "Categories" column/filter... SOLVED

Browse Source 
- According to the specifications.
- Was added the filter "Categories" only when Solar is disabled.
This commit is contained in:
Marco Antonio Nina
2012-09-17 11:07:22 -04:00
parent 0c71029c54
commit f1ce49c70e
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.applications.php
View File

@@ -3,7 +3,7 @@
class Applications
{
public function getAll($userUid, $start=null, $limit=null, $action=null, $filter=null, $search=null, $process=null, $category=null, $user=null, $status=null, $type=null, $dateFrom=null, $dateTo=null, $callback=null, $dir=null, $sort='APP_CACHE_VIEW.APP_NUMBER')
public function getAll($userUid, $start=null, $limit=null, $action=null, $filter=null, $search=null, $process=null, $user=null, $status=null, $type=null, $dateFrom=null, $dateTo=null, $callback=null, $dir=null, $sort='APP_CACHE_VIEW.APP_NUMBER', $category=null)
{
$callback = isset($callback) ? $callback : 'stcCallback1001';
$dir = isset($dir) ? $dir : 'DESC';
@@ -130,19 +130,19 @@ class Applications
// add the category filter
if ($category != '') {
$Criteria->addAlias('CP', 'PROCESS');
$Criteria->add ('CP.PRO_CATEGORY', $category, Criteria::EQUAL );
$Criteria->add('CP.PRO_CATEGORY', $category, Criteria::EQUAL );
$Criteria->addJoin(AppCacheViewPeer::PRO_UID, 'CP.PRO_UID', Criteria::LEFT_JOIN);
$Criteria->addAsColumn('CATEGORY_UID', 'CP.PRO_CATEGORY');
}
// add the user filter
if ( $user != '' ) {
$Criteria->add (AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
$Criteria->add(AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
$CriteriaCount->add (AppCacheViewPeer::USR_UID, $user, Criteria::EQUAL );
}
if ( $status != '' ) {
$Criteria->add (AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
$Criteria->add(AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
$CriteriaCount->add (AppCacheViewPeer::APP_STATUS, $status, Criteria::EQUAL );
}
@@ -268,7 +268,7 @@ class Applications
//case 1. when the SEARCH action is selected and none filter, search criteria is defined,
//we need to count using the table APPLICATION, because APP_CACHE_VIEW takes 3 seconds
if ( $action == 'search' && $filter == '' && $search == '' && $process == '' && $category == '' && $status == '' && $dateFrom == '' && $dateTo == '') {
if ( $action == 'search' && $filter == '' && $search == '' && $process == '' && $status == '' && $dateFrom == '' && $dateTo == '' && $category == '') {
$totalCount = $oAppCache->getSearchAllCount();
$doCountAlreadyExecuted = true;
}