upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mvc: minor cleanup in UIModelGrid, remove flatten() method as getFlatNodes() is almost the same.

Browse source
This commit is contained in:
Ad Schellevis 2026-04-11 19:07:48 +02:00
parent d739e53197
commit c81417f267
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php
View file

@ -114,7 +114,7 @@ class UIModelGrid
$fields,
$itemsPerPage,
$currentPage,
$sortBy = array(),
$sortBy = [],
$sortDescending = false,
$search_tokens = [],
$filter_funct = null,
@ -132,7 +132,11 @@ class UIModelGrid
// parse rows, because we may need to convert some (list) items we need to know the actual content
// before searching we flatten the resulting array in case of nested containers
$row = iterator_to_array($this->flatten(array_merge(['uuid' => $record->getAttributes()['uuid']], $record->getNodeContent())));
$row = ['uuid' => $record->getAttributes()['uuid']];
$reflen = strlen($record->__reference) + 1;
foreach ($record->getFlatNodes() as $key => $val) {
$row[substr($key, $reflen)] = $val->getValue();
}
// if search tokens are provided, use them to search in all requested fields
if (!empty($search_tokens)) {
@ -172,15 +176,4 @@ class UIModelGrid
return $result;
}
private function flatten($node, $path = '')
{
if (is_array($node)) {
foreach ($node as $key => $value) {
yield from $this->flatten($value, ltrim($path . '.' . $key, '.'));
}
} else {
yield $path => $node;
}
}
}