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

Merged in bugfix/HOR-4075 (pull request #6192)

Browse Source 
HOR-4075

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
David Callizaya
2017-11-21 21:13:41 +00:00
committed by Paula Quispe
parent f5355c07bd 2f77c5bac6
commit 0c22077c4d
14 changed files with 259 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -3582,6 +3582,9 @@ class Cases
break;
case 'USR_UID':
$columnSort = $this->buildOrderFieldFormatted($columnsList, $userDisplayFormat, 'DEL_CURRENT_');
if (empty($columnSort)) {
$columnSort = $this->buildOrderFieldFormatted($columnsList, $userDisplayFormat, '', false);
}
break;
default:
$columnSort = $listPeer::TABLE_NAME . '.' . $sort;
@@ -3612,13 +3615,13 @@ class Cases
*
* @return array $columnSort, columns by apply the sql command ORDER BY
*/
public function buildOrderFieldFormatted($columnsList, $format, $prefix = 'DEL_PREVIOUS_')
public function buildOrderFieldFormatted($columnsList, $format, $prefix = 'DEL_PREVIOUS_', $validate = true)
{
$columnSort = [];
if (in_array($prefix . 'USR_FIRSTNAME', $columnsList) &&
if (!$validate || (in_array($prefix . 'USR_FIRSTNAME', $columnsList) &&
in_array($prefix . 'USR_LASTNAME', $columnsList) &&
in_array($prefix . 'USR_USERNAME', $columnsList)
in_array($prefix . 'USR_USERNAME', $columnsList))
) {
switch ($format) {
case '@firstName @lastName':