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

4
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';
@@ -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;
}

14
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -91,14 +91,14 @@
$oHeadPublisher->assign('columns', $columns); //sending the columns to display in grid
$oHeadPublisher->assign('readerFields', $readerFields); //sending the fields to get from proxy
$oHeadPublisher->assign('reassignColumns', $reassignColumns); //sending the columns to display in grid
$oHeadPublisher->assign( 'action', $action ); //sending the fields to get from proxy
$oHeadPublisher->assign('action', $action); //sending the action to make
$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy
$oHeadPublisher->assign( 'statusValues', $status ); //sending the columns to display in grid
$oHeadPublisher->assign( 'processValues', $processes); //sending the columns to display in grid
$oHeadPublisher->assign( 'solrConf', System::solrEnv()); //sending the columns to display in grid
$oHeadPublisher->assign( 'categoryValues', $category); //sending the columns to display in grid
$oHeadPublisher->assign( 'userValues', $users); //sending the columns to display in grid
$oHeadPublisher->assign( 'allUsersValues',$allUsers); //sending the columns to display in grid
$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status
$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes
$oHeadPublisher->assign('solrConf', System::solrEnv()); //Sending the status of solar
$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories
$oHeadPublisher->assign('userValues', $users); //Sending the listing of users
$oHeadPublisher->assign('allUsersValues',$allUsers); //Sending the listing of all users

4
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -68,7 +68,6 @@ try {
$filter,
$search,
$process,
$category,
$user,
$status,
$type,
@@ -76,7 +75,8 @@ try {
$dateTo,
$callback,
$dir,
$sort
$sort,
$category
);
$result = G::json_encode($data);