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

HOR-3516

Browse Source
This commit is contained in:
Paula Quispe
2017-07-14 11:57:21 -04:00
parent cda8fab073
commit 1e8aeda475
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/model/ListInbox.php
View File

@@ -555,6 +555,7 @@ class ListInbox extends BaseListInbox
__CLASS__ . 'Peer', __CLASS__ . 'Peer',
BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_FIELDNAME,
empty($filters['sort']) ? "APP_UPDATE_DATE" : $filters['sort'], empty($filters['sort']) ? "APP_UPDATE_DATE" : $filters['sort'],
"APP_UPDATE_DATE",
$this->additionalClassName, $this->additionalClassName,
$additionalColumns $additionalColumns
); );

1
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -370,6 +370,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
__CLASS__ . 'Peer', __CLASS__ . 'Peer',
BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_FIELDNAME,
empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'], empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'],
"DEL_DELEGATE_DATE",
$this->additionalClassName, $this->additionalClassName,
$additionalColumns $additionalColumns
); );

1
workflow/engine/classes/model/ListPaused.php
View File

@@ -313,6 +313,7 @@ class ListPaused extends BaseListPaused
__CLASS__ . 'Peer', __CLASS__ . 'Peer',
BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_FIELDNAME,
empty($filters['sort']) ? "APP_PAUSED_DATE" : $filters['sort'], empty($filters['sort']) ? "APP_PAUSED_DATE" : $filters['sort'],
"APP_PAUSED_DATE",
$this->additionalClassName, $this->additionalClassName,
$additionalColumns $additionalColumns
); );

1
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -308,6 +308,7 @@ class ListUnassigned extends BaseListUnassigned
__CLASS__ . 'Peer', __CLASS__ . 'Peer',
BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_FIELDNAME,
empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'], empty($filters['sort']) ? "DEL_DELEGATE_DATE" : $filters['sort'],
"DEL_DELEGATE_DATE",
$this->additionalClassName, $this->additionalClassName,
$additionalColumns $additionalColumns
); );

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

@@ -3337,13 +3337,14 @@ class Cases
* @param string $listPeer, name of the list class * @param string $listPeer, name of the list class
* @param string $field, name of the fieldName * @param string $field, name of the fieldName
* @param string $sort, name of column by sort * @param string $sort, name of column by sort
* @param string $defaultSort, name of column by sort default
* @param string $additionalClassName, name of the className of pmTable * @param string $additionalClassName, name of the className of pmTable
* @param array $additionalColumns, columns related to the custom cases list * @param array $additionalColumns, columns related to the custom cases list
* @return string $tableName * @return string $tableName
*/ */
public function getSortColumn($listPeer, $field, $sort, $additionalClassName = '', $additionalColumns = array()) public function getSortColumn($listPeer, $field, $sort, $defaultSort, $additionalClassName = '', $additionalColumns = array())
{ {
$columnSort = $sort; $columnSort = $defaultSort;
//We will check if the column by sort is a LIST table //We will check if the column by sort is a LIST table
$columnsList = $listPeer::getFieldNames($field); $columnsList = $listPeer::getFieldNames($field);
@@ -3351,16 +3352,17 @@ class Cases
$columnSort = $listPeer::TABLE_NAME . '.' . $sort; $columnSort = $listPeer::TABLE_NAME . '.' . $sort;
} else { } else {
//We will sort by CUSTOM CASE LIST table //We will sort by CUSTOM CASE LIST table
if (count($additionalColumns) > 0) { if (in_array($sort, $additionalColumns)) {
require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $additionalClassName . '.php'); require_once(PATH_DATA_SITE . 'classes' . PATH_SEP . $additionalClassName . '.php');
$aTable = explode('.', current($additionalColumns)); $aTable = explode('.', current($additionalColumns));
if (count($aTable) > 0) { if (count($aTable) > 0) {
$tableName = $aTable[0]; $tableName = $aTable[0];
} }
if (!empty($tableName)) {
$columnSort = $tableName . '.' . $sort;
}
} }
if (!empty($tableName)) {
$columnSort = $tableName . '.' . $sort;
}
} }
return $columnSort; return $columnSort;