diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php old mode 100644 new mode 100755 index 6065b5b97..4d8b7c77e --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -16,7 +16,8 @@ class Applications $callback = null, $dir = null, $sort = "APP_CACHE_VIEW.APP_NUMBER", - $category = null + $category = null, + $configuration = true ) { $callback = isset($callback)? $callback : "stcCallback1001"; $dir = isset($dir)? $dir : "DESC"; @@ -45,11 +46,12 @@ class Applications $oAppCache = new AppCacheView(); - //get data configuration - $conf = new Configurations(); - $confCasesList = $conf->getConfiguration("casesList", ($action == "search" || $action == "simple_search")? "search" : $action); - $oAppCache->confCasesList = $confCasesList; - + if ($configuration == true) { + //get data configuration + $conf = new Configurations(); + $confCasesList = $conf->getConfiguration("casesList", ($action == "search" || $action == "simple_search")? "search" : $action); + $oAppCache->confCasesList = $confCasesList; + } // get the action based list switch ($action) { case "draft": @@ -440,8 +442,7 @@ class Applications $result = array (); $result['totalCount'] = $totalCount; $rows = array (); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH' - ); + $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); $index = $start; while ($aRow = $oDataset->getRow()) { //$aRow = $oAppCache->replaceRowUserData($aRow); diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 27eab0fcd..938e31a3b 100755 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -320,7 +320,7 @@ class Home extends Controller break; } - $cases = $apps->getAll( $user, $start, $limit, $type, $filter, $search, $process, $status, $type, $dateFrom, $dateTo, $callback, $dir, $sort, $category); + $cases = $apps->getAll( $user, $start, $limit, $type, $filter, $search, $process, $status, $type, $dateFrom, $dateTo, $callback, $dir, $sort, $category, false); // formating & complitting apps data with 'Notes' foreach ($cases['data'] as $i => $row) {