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

BUG 0000 "Problem in the ordering of the column 'current..." SOLVED

Browse Source 
- Problem in the ordering of the column "current user" and "task" in casesList
- Solved problem the ordering, has taken into account the settings made in ADMIN>Settings>Environment
* Available from version ProcessMaker-2.0.46
This commit is contained in:
Victor Saisa Lopez
2013-03-21 17:19:54 -04:00
parent d3f90b6c48
commit e2d48fb9de
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,12 +394,44 @@ class Applications
$totalCount = AppCacheViewPeer::doCount($CriteriaCount, $distinct); $totalCount = AppCacheViewPeer::doCount($CriteriaCount, $distinct);
} }
//add sortable options //Add sortable options
if ($sort != '') { if ($sort != "") {
if ($dir == 'DESC') { //Current delegation (*)
$Criteria->addDescendingOrderByColumn( $sort ); if (($action == "sent" || $action == "search" || $action == "simple_search" || $action == "to_revise" || $action == "to_reassign") && ($status != "TO_DO")) {
switch ($sort) {
case "APP_CACHE_VIEW.APP_CURRENT_USER":
$sort = "USRCR_USR_LASTNAME";
$confEnvSetting = $conf->getConfiguration("ENVIRONMENT_SETTINGS", "");
if (is_array($confEnvSetting)) {
$arrayAux = explode(" ", str_replace(array("(", ")", ","), array(null, null, null), $confEnvSetting["format"]));
if (isset($arrayAux[0])) {
switch (trim($arrayAux[0])) {
case "@userName":
$sort = "USRCR_USR_USERNAME";
break;
case "@firstName":
$sort = "USRCR_USR_FIRSTNAME";
break;
case "@lastName":
$sort = "USRCR_USR_LASTNAME";
break;
}
}
}
break;
case "APP_CACHE_VIEW.APP_TAS_TITLE":
$sort = "APPCVCR_APP_TAS_TITLE";
break;
}
}
if ($dir == "DESC") {
$Criteria->addDescendingOrderByColumn($sort);
} else { } else {
$Criteria->addAscendingOrderByColumn( $sort ); $Criteria->addAscendingOrderByColumn($sort);
} }
} }
@@ -444,7 +476,7 @@ class Applications
$maxDataset->close(); $maxDataset->close();
}*/ }*/
//Current delegation //Current delegation (*)
if (($action == "sent" || $action == "search" || $action == "simple_search" || $action == "to_revise" || $action == "to_reassign") && ($status != "TO_DO")) { if (($action == "sent" || $action == "search" || $action == "simple_search" || $action == "to_revise" || $action == "to_reassign") && ($status != "TO_DO")) {
//Current task //Current task
$aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"]; $aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"];