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

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

Browse Source
This commit is contained in:
Roly Gutierrez
2021-08-10 22:48:28 -04:00
parent 9fb807ccb9
commit 95f14fd66a
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 = []; $result = [];
foreach ($default as &$column) { foreach ($default as &$column) {
foreach ($storedColumns as $storedColumn) { foreach ($storedColumns as $storedColumn) {
if (!is_array($storedColumn) || !isset($storedColumn['field'])) { if (!is_object($storedColumn)) {
continue; continue;
} }
if ($storedColumn['field'] === $column['field']) { $storedColumn = (array) $storedColumn;
$column['enableFilter'] = $storedColumn['enableFilter']; if (!isset($storedColumn['field'])) {
$column['set'] = $storedColumn['set']; continue;
}
if ($column['field'] === $storedColumn['field']) {
if (isset($storedColumn['enableFilter'])) {
$column['enableFilter'] = $storedColumn['enableFilter'];
}
if (isset($storedColumn['set'])) {
$column['set'] = $storedColumn['set'];
}
break; break;
} }
} }
@@ -472,11 +480,13 @@ class CaseList extends Model
]; ];
} }
} }
return [ $format = [
'name' => $result['rep_tab_name'], 'uid' => $result['rep_uid'],
'description' => $result['rep_tab_description'], 'name' => $result['rep_tab_name'],
'fields' => $fields 'description' => $result['rep_tab_description'],
'fields' => $fields
]; ];
return $format;
}); });
$result = $additionalTables->toArray(); $result = $additionalTables->toArray();