lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVC/ApiControllerBase::searchRecordsetBase - fill missing keys when sorting, prevents "sizes are inconsistent" and eases operation for the caller. ref https://github.com/opnsense/plugins/pull/3484#issuecomment-1609023477

Browse Source
This commit is contained in:
Ad Schellevis 2023-06-27 18:17:51 +02:00
parent 758b0aafe5
commit e8bb2ea933
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
View File

@ -61,22 +61,26 @@ class ApiControllerBase extends ControllerRoot
$entry_keys = array_keys($records);
$searchPhrase = (string)$this->request->getPost('searchPhrase', null, '');
$sortOrder = SORT_ASC;
$sortKey = $defaultSort;
if (
$this->request->hasPost('sort') &&
is_array($this->request->getPost('sort')) &&
!empty($this->request->getPost('sort'))
) {
$keys = array_keys($this->request->getPost('sort'));
$order = $this->request->getPost('sort')[$keys[0]];
$keys = array_column($records, $keys[0]);
if (!empty($keys)) {
array_multisort($keys, $order == 'asc' ? SORT_ASC : SORT_DESC, $sort_flags, $records);
}
} elseif (!empty($defaultSort)) {
$keys = array_column($records, $defaultSort);
if (!empty($keys)) {
array_multisort($keys, SORT_ASC, $sort_flags, $records);
$sortOrder = $this->request->getPost('sort')[$keys[0]] == 'asc' ? SORT_ASC : SORT_DESC;
$sortKey = $keys[0];
}
if (!empty($sortKey) && !empty($records)) {
// make sure the sort key exists in the recordset to prevent "sizes are inconsistent"
foreach ($records as &$record) {
if (!isset($record[$sortKey])) {
$record[$sortKey] = null;
}
}
$keys = array_column($records, $sortKey);
array_multisort($keys, $sortOrder, $sort_flags, $records);
}
$entry_keys = array_filter($entry_keys, function ($key) use ($searchPhrase, $filter_funct, $fields, $records) {