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

Merged in cmdeguzman/cdgz-processmaker/HOR-278 (pull request #3786)

Browse Source 
HOR-278
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-07 11:22:27 -04:00
parent 34a038f768 89e271e667
commit f9eb24ca50
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/methods/events/eventsAjax.php
View File

@@ -109,6 +109,19 @@ switch($req){
$criteria = new Criteria();
$criteria = $oAppEvent->getAppEventsCriteria($proUid, $evenStatus, $evenType);
$allowedSortField = array(
'PRO_TITLE',
'TAS_TITLE',
'APP_TITLE',
'APP_EVN_ACTION_DATE',
'APP_EVN_LAST_EXECUTION_DATE',
);
if (!in_array($sort, $allowedSortField)) {
$sort = "";
}
if ($sort != '') {
if ($dir == 'ASC') {
$criteria->addAscendingOrderByColumn($sort);
@@ -116,7 +129,7 @@ switch($req){
$criteria->addDescendingOrderByColumn($sort);
}
} else {
$oCriteria->addDescendingOrderByColumn(AppEventPeer::APP_EVN_ACTION_DATE);
$criteria->addDescendingOrderByColumn(AppEventPeer::APP_EVN_ACTION_DATE);
}
if ($limit != '') {
$criteria->setLimit($limit);