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

Merged in bugfix/PMCORE-3206 (pull request #8041)

Browse Source 
PMCORE-3206 Improve the endpoint api/1.0/workflow/caseList/report-tables

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Roly Rudy Gutierrez Pinto
2021-08-11 13:43:19 +00:00
committed by Julio Cesar Laura Avendaño
parent 89603b3ba8 95f14fd66a
commit 35adc6260d
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/src/ProcessMaker/Model/CaseList.php
View File

@@ -426,12 +426,20 @@ class CaseList extends Model
$result = [];
foreach ($default as &$column) {
foreach ($storedColumns as $storedColumn) {
if (!is_array($storedColumn) || !isset($storedColumn['field'])) {
if (!is_object($storedColumn)) {
continue;
}
if ($storedColumn['field'] === $column['field']) {
$column['enableFilter'] = $storedColumn['enableFilter'];
$column['set'] = $storedColumn['set'];
$storedColumn = (array) $storedColumn;
if (!isset($storedColumn['field'])) {
continue;
}
if ($column['field'] === $storedColumn['field']) {
if (isset($storedColumn['enableFilter'])) {
$column['enableFilter'] = $storedColumn['enableFilter'];
}
if (isset($storedColumn['set'])) {
$column['set'] = $storedColumn['set'];
}
break;
}
}
@@ -472,11 +480,13 @@ class CaseList extends Model
];
}
}
return [
'name' => $result['rep_tab_name'],
'description' => $result['rep_tab_description'],
'fields' => $fields
$format = [
'uid' => $result['rep_uid'],
'name' => $result['rep_tab_name'],
'description' => $result['rep_tab_description'],
'fields' => $fields
];
return $format;
});
$result = $additionalTables->toArray();