diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 90f4a1d82..46f814a31 100755 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -512,20 +512,20 @@ class Applications $oCriteria->addAscendingOrderByColumn(FieldsPeer::FLD_INDEX); $oDataset = FieldsPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - $row = $oDataset->getRow(); - if (is_array($row)) { + + if ($oDataset->next()) { $sort = $tableNameAux . "." . $sortTable[1]; } } - if ($sort == "") { - $sort = $sortBk; - } + $arraySelectColumn = $Criteria->getSelectColumns(); - if (!in_array($sort, $Criteria->getSelectColumns())) { - $sort = AppCacheViewPeer::APP_NUMBER; //DEFAULT VALUE + if (!in_array($sort, $arraySelectColumn)) { + $sort = $sortBk; + + if (!in_array($sort, $arraySelectColumn)) { + $sort = AppCacheViewPeer::APP_NUMBER; //DEFAULT VALUE + } } if ($dir == "DESC") { diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 2b3ab3c07..0bfae0d5e 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -330,7 +330,7 @@ class Configurations // extends Configuration $aux = str_replace('@userName', trim($username), $theFormat); $aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux); - $aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux); + $aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux); } return $aux; } @@ -583,7 +583,7 @@ class Configurations // extends Configuration require_once 'model/Language.php'; $language = new language(); $lanLocation = $language->findLocationByLanId(SYS_LANG); - $location = isset($lanLocation['LAN_LOCATION']) ? $lanLocation['LAN_LOCATION'] : ''; + $location = isset($lanLocation['LAN_LOCATION']) ? $lanLocation['LAN_LOCATION'] : ''; if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') { if (SYS_LANG == 'es') { @@ -612,7 +612,7 @@ class Configurations // extends Configuration break; } } - + if (defined('PARTNER_FLAG')) { setlocale(LC_TIME, $langLocate); $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y))); @@ -698,7 +698,6 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "DEL_PRIORITY"); - $caseReaderFields[] = array("name" => "APP_STATUS_LABEL"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); @@ -733,7 +732,6 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "DEL_PRIORITY"); - $caseReaderFields[] = array("name" => "APP_STATUS_LABEL"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_THREAD_INDEX"); $caseReaderFields[] = array("name" => "CASE_SUMMARY"); @@ -770,7 +768,6 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "DEL_PRIORITY"); - $caseReaderFields[] = array("name" => "APP_STATUS_LABEL"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); @@ -843,7 +840,6 @@ class Configurations // extends Configuration $caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "DEL_DELEGATE_DATE"); $caseReaderFields[] = array("name" => "DEL_PRIORITY"); - $caseReaderFields[] = array("name" => "APP_STATUS_LABEL"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index 041aebb0a..39d2a446c 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -877,6 +877,8 @@ class AppCacheView extends BaseAppCacheView } foreach ($this->confCasesList["second"]["data"] as $fieldData) { + $fieldData['name'] = ($fieldData['name'] == 'APP_STATUS_LABEL')? 'APP_STATUS' : $fieldData['name']; + if (in_array($fieldData["name"], $defaultFields)) { switch ($fieldData["fieldType"]) { case "case field": diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index 354915f0f..2abf2df5e 100755 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -173,7 +173,6 @@ $oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields t $oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid $oHeadPublisher->assign( 'action', $action ); //sending the action to make $oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy to make -$oHeadPublisher->assign( 'caseListBuilder', $caseListBuilder ); //sending the caseListBuilder $oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy $oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status $oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes diff --git a/workflow/engine/methods/cases/proxyNewCasesList.php b/workflow/engine/methods/cases/proxyNewCasesList.php index cdc6827bd..a20198e70 100644 --- a/workflow/engine/methods/cases/proxyNewCasesList.php +++ b/workflow/engine/methods/cases/proxyNewCasesList.php @@ -27,7 +27,7 @@ try { $filters['start'] = isset( $_REQUEST["start"] ) ? $_REQUEST["start"] : "0"; $filters['limit'] = isset( $_REQUEST["limit"] ) ? $_REQUEST["limit"] : "25"; - $filters['sort'] = isset( $_REQUEST["sort"] ) ? $_REQUEST["sort"] : ""; + $filters['sort'] = (isset($_REQUEST['sort']))? (($_REQUEST['sort'] == 'APP_STATUS_LABEL')? 'APP_STATUS' : $_REQUEST['sort']) : ''; $filters['dir'] = isset( $_REQUEST["dir"] ) ? $_REQUEST["dir"] : "DESC"; $filters['action'] = isset( $_REQUEST["action"] ) ? $_REQUEST["action"] : ""; diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 32bf0f85f..351f9a6a1 100755 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -134,7 +134,7 @@ function openCase(){ if(casesNewTab) { casesNewTab.close(); } - casesNewTab = window.open(requestFile + '?' + params); + casesNewTab = window.open(requestFile + '?' + params); } else { redirect(requestFile + '?' + params); } @@ -748,21 +748,12 @@ Ext.onReady ( function() { }); } - // Create HttpProxy instance, all CRUD requests will be directed to single proxy url. - if (caseListBuilder) { - var proxyCasesList = new Ext.data.HttpProxy({ - api: { - read : urlProxy - } - }); - } else { - var proxyCasesList = new Ext.data.HttpProxy({ - api: { - read : urlProxy - } - }); - } + var proxyCasesList = new Ext.data.HttpProxy({ + api: { + read : urlProxy + } + }); // Typical JsonReader with additional meta-data params for defining the core attributes of your json-response // the readerFields is defined in PHP server side @@ -2486,4 +2477,4 @@ Ext.EventManager.on(window, 'beforeunload', function () { if(casesNewTab) { casesNewTab.close(); } -}); +});