tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add parameter $searchColumns to ::filterQuery()

Browse Source 
refs #8241
This commit is contained in:
Alexander A. Klimov 2015-05-19 13:29:21 +02:00
parent bd7c7f9636
commit 85dd496d35
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/monitoring/application/controllers/ListController.php
View File

@ -12,6 +12,7 @@ use Icinga\Web\Widget\Tabs;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use Icinga\Module\Monitoring\Forms\StatehistoryForm; use Icinga\Module\Monitoring\Forms\StatehistoryForm;
use Icinga\Data\Filterable;
class Monitoring_ListController extends Controller class Monitoring_ListController extends Controller
{ {
@ -625,7 +626,15 @@ class Monitoring_ListController extends Controller
$this->view->verticalPaginator = $pivot->paginateYAxis(); $this->view->verticalPaginator = $pivot->paginateYAxis();
} }
protected function filterQuery($query) /**
* Apply filters on a query
*
* @param Filterable $query The query to apply filters on
* @param array $searchColumns Columns to search in
*
* @return Filterable $query
*/
protected function filterQuery(Filterable $query, array $searchColumns = null)
{ {
$editor = Widget::create('filterEditor') $editor = Widget::create('filterEditor')
->setQuery($query) ->setQuery($query)
@ -633,8 +642,11 @@ class Monitoring_ListController extends Controller
'limit', 'sort', 'dir', 'format', 'view', 'backend', 'limit', 'sort', 'dir', 'format', 'view', 'backend',
'stateType', 'addColumns', '_dev' 'stateType', 'addColumns', '_dev'
) )
->ignoreParams('page') ->ignoreParams('page');
->handleRequest($this->getRequest()); if ($searchColumns !== null) {
$editor->setSearchColumns($searchColumns);
}
$editor->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter()); $query->applyFilter($editor->getFilter());
$this->setupFilterControl($editor); $this->setupFilterControl($editor);