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

PM-3713 "0018661: No se pueden ordenar los campos en los..." SOLVED

Browse Source 
Issue:
    0018661: No se pueden ordenar los campos en los las bandejas de ProcessMaker
Cause:
    No se procesa el campo status
Solution:
    - Al hacer un request con el campo status, este es validado y procesado
    - El ordenamiento de columnas trabaja de manera correcta con el resto de los campos

PM-3713 "0018661: No se pueden ordenar los campos en los..." SOLVED

Issue:
    0018661: No se pueden ordenar los campos en los las bandejas de ProcessMaker
Cause:
    No se procesa el campo status
Solution:
    - Al hacer un request con el campo status, este es validado y procesado
    - El ordenamiento de columnas trabaja de manera correcta con el resto de los campos
This commit is contained in:
Victor Saisa Lopez
2015-12-03 17:30:42 -04:00
parent 3a9c268f48
commit 82981def7d
6 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,20 +512,20 @@ class Applications
$oCriteria->addAscendingOrderByColumn(FieldsPeer::FLD_INDEX); $oCriteria->addAscendingOrderByColumn(FieldsPeer::FLD_INDEX);
$oDataset = FieldsPeer::doSelectRS($oCriteria); $oDataset = FieldsPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); if ($oDataset->next()) {
$row = $oDataset->getRow();
if (is_array($row)) {
$sort = $tableNameAux . "." . $sortTable[1]; $sort = $tableNameAux . "." . $sortTable[1];
} }
} }
if ($sort == "") { $arraySelectColumn = $Criteria->getSelectColumns();
$sort = $sortBk;
}
if (!in_array($sort, $Criteria->getSelectColumns())) { if (!in_array($sort, $arraySelectColumn)) {
$sort = AppCacheViewPeer::APP_NUMBER; //DEFAULT VALUE $sort = $sortBk;
if (!in_array($sort, $arraySelectColumn)) {
$sort = AppCacheViewPeer::APP_NUMBER; //DEFAULT VALUE
}
} }
if ($dir == "DESC") { if ($dir == "DESC") {

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

@@ -330,7 +330,7 @@ class Configurations // extends Configuration
$aux = str_replace('@userName', trim($username), $theFormat); $aux = str_replace('@userName', trim($username), $theFormat);
$aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux); $aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux);
$aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux); $aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux);
} }
return $aux; return $aux;
} }
@@ -583,7 +583,7 @@ class Configurations // extends Configuration
require_once 'model/Language.php'; require_once 'model/Language.php';
$language = new language(); $language = new language();
$lanLocation = $language->findLocationByLanId(SYS_LANG); $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 (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') {
if (SYS_LANG == 'es') { if (SYS_LANG == 'es') {
@@ -612,7 +612,7 @@ class Configurations // extends Configuration
break; break;
} }
} }
if (defined('PARTNER_FLAG')) { if (defined('PARTNER_FLAG')) {
setlocale(LC_TIME, $langLocate); setlocale(LC_TIME, $langLocate);
$dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y))); $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" => "DEL_TASK_DUE_DATE");
$caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE");
$caseReaderFields[] = array("name" => "DEL_PRIORITY"); $caseReaderFields[] = array("name" => "DEL_PRIORITY");
$caseReaderFields[] = array("name" => "APP_STATUS_LABEL");
$caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE");
$caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_SUMMARY");
$caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT");
@@ -733,7 +732,6 @@ class Configurations // extends Configuration
$caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE");
$caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE");
$caseReaderFields[] = array("name" => "DEL_PRIORITY"); $caseReaderFields[] = array("name" => "DEL_PRIORITY");
$caseReaderFields[] = array("name" => "APP_STATUS_LABEL");
$caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE");
$caseReaderFields[] = array("name" => "APP_THREAD_INDEX"); $caseReaderFields[] = array("name" => "APP_THREAD_INDEX");
$caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_SUMMARY");
@@ -770,7 +768,6 @@ class Configurations // extends Configuration
$caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE");
$caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE");
$caseReaderFields[] = array("name" => "DEL_PRIORITY"); $caseReaderFields[] = array("name" => "DEL_PRIORITY");
$caseReaderFields[] = array("name" => "APP_STATUS_LABEL");
$caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE");
$caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_SUMMARY");
$caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT");
@@ -843,7 +840,6 @@ class Configurations // extends Configuration
$caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE");
$caseReaderFields[] = array("name" => "DEL_DELEGATE_DATE"); $caseReaderFields[] = array("name" => "DEL_DELEGATE_DATE");
$caseReaderFields[] = array("name" => "DEL_PRIORITY"); $caseReaderFields[] = array("name" => "DEL_PRIORITY");
$caseReaderFields[] = array("name" => "APP_STATUS_LABEL");
$caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE");
$caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_SUMMARY");
$caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT");

2
workflow/engine/classes/model/AppCacheView.php
View File

@@ -877,6 +877,8 @@ class AppCacheView extends BaseAppCacheView
} }
foreach ($this->confCasesList["second"]["data"] as $fieldData) { foreach ($this->confCasesList["second"]["data"] as $fieldData) {
$fieldData['name'] = ($fieldData['name'] == 'APP_STATUS_LABEL')? 'APP_STATUS' : $fieldData['name'];
if (in_array($fieldData["name"], $defaultFields)) { if (in_array($fieldData["name"], $defaultFields)) {
switch ($fieldData["fieldType"]) { switch ($fieldData["fieldType"]) {
case "case field": case "case field":

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

@@ -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( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'action', $action ); //sending the action to make $oHeadPublisher->assign( 'action', $action ); //sending the action to make
$oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy 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( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status $oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status
$oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes $oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes

2
workflow/engine/methods/cases/proxyNewCasesList.php
View File

@@ -27,7 +27,7 @@ try {
$filters['start'] = isset( $_REQUEST["start"] ) ? $_REQUEST["start"] : "0"; $filters['start'] = isset( $_REQUEST["start"] ) ? $_REQUEST["start"] : "0";
$filters['limit'] = isset( $_REQUEST["limit"] ) ? $_REQUEST["limit"] : "25"; $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['dir'] = isset( $_REQUEST["dir"] ) ? $_REQUEST["dir"] : "DESC";
$filters['action'] = isset( $_REQUEST["action"] ) ? $_REQUEST["action"] : ""; $filters['action'] = isset( $_REQUEST["action"] ) ? $_REQUEST["action"] : "";

23
workflow/engine/templates/cases/casesList.js
View File

@@ -134,7 +134,7 @@ function openCase(){
if(casesNewTab) { if(casesNewTab) {
casesNewTab.close(); casesNewTab.close();
} }
casesNewTab = window.open(requestFile + '?' + params); casesNewTab = window.open(requestFile + '?' + params);
} else { } else {
redirect(requestFile + '?' + params); redirect(requestFile + '?' + params);
} }
@@ -748,21 +748,12 @@ Ext.onReady ( function() {
}); });
} }
// Create HttpProxy instance, all CRUD requests will be directed to single proxy url. // Create HttpProxy instance, all CRUD requests will be directed to single proxy url.
if (caseListBuilder) { var proxyCasesList = new Ext.data.HttpProxy({
var proxyCasesList = new Ext.data.HttpProxy({ api: {
api: { read : urlProxy
read : urlProxy }
} });
});
} else {
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 // Typical JsonReader with additional meta-data params for defining the core attributes of your json-response
// the readerFields is defined in PHP server side // the readerFields is defined in PHP server side
@@ -2486,4 +2477,4 @@ Ext.EventManager.on(window, 'beforeunload', function () {
if(casesNewTab) { if(casesNewTab) {
casesNewTab.close(); casesNewTab.close();
} }
}); });