lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVC, add filter closure to searchBase(), for https://github.com/opnsense/plugins/pull/1274

Browse Source
This commit is contained in:
Ad Schellevis 2019-03-25 12:52:26 +01:00
parent c16129ad24
commit 8ae69d5f06
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php
View File

@ -234,10 +234,11 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase
* @param string $path path to search, relative to this model
* @param array $fields fieldnames to fetch in result
* @param string|null $defaultSort default sort field name
* @param null|function $filter_funct additional filter callable
* @return array
* @throws \ReflectionException when binding to the model class fails
*/
public function searchBase($path, $fields, $defaultSort = null)
public function searchBase($path, $fields, $defaultSort = null, $filter_funct = null)
{
$this->sessionClose();
$element = $this->getModel();
@ -248,7 +249,8 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase
return $grid->fetchBindRequest(
$this->request,
$fields,
$defaultSort
$defaultSort,
$filter_funct
);
}

16
src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php
View File

@ -53,9 +53,10 @@ class UIModelGrid
* @param $request request variable
* @param array $fields to collect
* @param null|string $defaultSort default sort order
* @param null|function $filter_funct additional filter callable
* @return array
*/
public function fetchBindRequest($request, $fields, $defaultSort = null)
public function fetchBindRequest($request, $fields, $defaultSort = null, $filter_funct = null)
{
$itemsPerPage = $request->get('rowCount', 'int', -1);
$currentPage = $request->get('current', 'int', 1);
@ -70,7 +71,9 @@ class UIModelGrid
}
$searchPhrase = $request->get('searchPhrase', 'string', '');
return $this->fetch($fields, $itemsPerPage, $currentPage, $sortBy, $sortDescending, $searchPhrase);
return $this->fetch(
$fields, $itemsPerPage, $currentPage, $sortBy, $sortDescending, $searchPhrase, $filter_funct
);
}
/**
@ -81,6 +84,7 @@ class UIModelGrid
* @param array $sortBy sort by fieldnames
* @param bool $sortDescending sort in descending order
* @param string $searchPhrase search phrase to use
* @param null|function $filter_funct additional filter callable
* @return array
*/
public function fetch(
@ -89,13 +93,19 @@ class UIModelGrid
$currentPage,
$sortBy = array(),
$sortDescending = false,
$searchPhrase = ''
$searchPhrase = '',
$filter_funct = null
) {
$result = array('rows'=>array());
$recordIndex = 0;
foreach ($this->DataField->sortedBy($sortBy, $sortDescending) as $record) {
if (array_key_exists("uuid", $record->getAttributes())) {
if (is_callable($filter_funct) && !$filter_funct($record)) {
// not applicable according to $filter_funct()
continue;
}
// parse rows, because we may need to convert some (list) items we need to know the actual content
// before searching.
$row = array();