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

Merged in bugfix/PMCORE-3100 (pull request #7972)

Browse Source 
PMCORE-3100

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-07-13 15:29:36 +00:00
committed by Julio Cesar Laura Avendaño
parent 5e42862f71 8c14ddff8f
commit bc169bcd77
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php
View File

@@ -34,6 +34,8 @@ class AbstractCases implements CasesInterface
const STATUS_TODO = 2;
const STATUS_COMPLETED = 3;
const STATUS_CANCELED = 4;
// Order by column allowed
const ORDER_BY_COLUMN_ALLOWED = ['APP_NUMBER', 'DEL_TITLE', 'PRO_TITLE'];
// Filter by category from a process, know as "$category" in the old lists classes
private $categoryUid = '';
@@ -957,6 +959,11 @@ class AbstractCases implements CasesInterface
// Convert the value to upper case
$orderByColumn = strtoupper($orderByColumn);
// Validate the order by column
if (!in_array($orderByColumn, self::ORDER_BY_COLUMN_ALLOWED)) {
throw new Exception("Order by column '{$orderByColumn}' is not valid.");
}
$this->orderByColumn = $orderByColumn;
}

24
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -85,8 +85,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
$list->setProperties($properties);
@@ -143,8 +143,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
$list->setProperties($properties);
@@ -201,8 +201,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
// todo: some queries related to the unassigned are using the USR_UID
@@ -261,8 +261,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
$list->setProperties($properties);
@@ -335,8 +335,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
$result = [];
@@ -494,8 +494,8 @@ class Home extends Api
// Set the pagination parameters
$paged = explode(',', $paged);
$sort = explode(',', $sort);
$properties['start'] = $paged[0];
$properties['limit'] = $paged[1];
$properties['start'] = (int)$paged[0];
$properties['limit'] = (int)$paged[1];
$properties['sort'] = $sort[0];
$properties['dir'] = $sort[1];
$list->setProperties($properties);