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

Merged in bugfix/PMCORE-3369 (pull request #8172)

Browse Source 
PMCORE-3366

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-09-24 19:31:51 +00:00
committed by Julio Cesar Laura Avendaño
parent f24611127e 27c3bc4f6c
commit b48a56796d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/src/ProcessMaker/Model/Process.php
View File

@@ -410,10 +410,11 @@ class Process extends Model
* @param string $category
* @param int $offset
* @param int $limit
* @param bool $paged
*
* @return array
*/
public static function getProcessesForHome($text = null, $category = null, $offset = null, $limit = null)
public static function getProcessesForHome($text = null, $category = null, $offset = null, $limit = null, $paged = true)
{
// Get base query
$query = Process::query()->select(['PRO_ID', 'PRO_TITLE']);
@@ -431,12 +432,15 @@ class Process extends Model
// Set "PRO_STATUS" condition
$query->status('ACTIVE');
// Set pagination if offset and limit are sent
if (!is_null($offset) && !is_null($limit)) {
$query->offset($offset);
$query->limit($limit);
if ($paged) {
// Set pagination if offset and limit are sent
if (!is_null($offset) && !is_null($limit)) {
$query->offset($offset);
$query->limit($limit);
}
}
// Order by "PRO_TITLE"
$query->orderBy('PRO_TITLE');

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

@@ -861,6 +861,7 @@ class Home extends Api
* @param string $category
* @param int $offset
* @param int $limit
* @param bool $paged
*
* @return array
*
@@ -869,7 +870,7 @@ class Home extends Api
* @access protected
* @class AccessControl {@permission PM_CASES}
*/
public function getProcesses($text = null, $category = null, int $offset = 0, int $limit = 15)
public function getProcesses($text = null, $category = null, int $offset = 0, int $limit = 15, $paged = true)
{
try {
return Process::getProcessesForHome($text, $category, $offset, $limit);