fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/HOR-359-A-3018 (pull request #3806)

Browse Source 
HOR-359-A
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-08 17:50:33 -04:00
parent 859c132a65 6ff92539b7
commit 9cf0b0b42d
3 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,6 +250,8 @@ class Cases
$type = "extjs";
$dateFrom = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : "";
$dateTo = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : "";
$newerThan = (!empty($dataList['newerThan']))? $dataList['newerThan'] : '';
$oldestThan = (!empty($dataList['oldestthan']))? $dataList['oldestthan'] : '';
$first = isset( $dataList["first"] ) ? true :false;
$u = new \ProcessMaker\BusinessModel\User();
@@ -291,7 +293,7 @@ class Cases
}
$dir = G::toUpper($dir);
if (!($dir == 'DESC' || $dir == 'ASC')) {
$dir = 'DESC';
$dir = 'ASC';
}
if ($process != '') {
Validator::proUid($process, '$pro_uid');
@@ -383,7 +385,9 @@ class Cases
(strpos($sort, ".") !== false)? $sort : "APP_CACHE_VIEW." . $sort,
$category,
true,
$paged
$paged,
$newerThan,
$oldestThan
);
}
if (!empty($result['data'])) {