tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename parameter $query of ::filterQuery() to $dataView 

refs #8241
This commit is contained in:
Alexander A. Klimov 2015-05-19 15:43:47 +02:00
parent 3243f9a65a
commit 36713fb519
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ 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; use Icinga\Data\Filterable;
use Icinga\Module\Monitoring\DataView\DataView;
class Monitoring_ListController extends Controller class Monitoring_ListController extends Controller
{ {
@ -627,17 +628,17 @@ class Monitoring_ListController extends Controller
} }
/** /**
* Apply filters on a query * Apply filters on a DataView
* *
* @param Filterable $query The query to apply filters on * @param DataView $dataView The DataView to apply filters on
* @param array $searchColumns Columns to search in * @param array $searchColumns Columns to search in
* *
* @return Filterable $query * @return DataView $dataView
*/ */
protected function filterQuery(Filterable $query, array $searchColumns = null) protected function filterQuery(DataView $dataView, array $searchColumns = null)
{ {
$editor = Widget::create('filterEditor') $editor = Widget::create('filterEditor')
->setQuery($query) ->setQuery($dataView)
->preserveParams( ->preserveParams(
'limit', 'sort', 'dir', 'format', 'view', 'backend', 'limit', 'sort', 'dir', 'format', 'view', 'backend',
'stateType', 'addColumns', '_dev' 'stateType', 'addColumns', '_dev'
@ -647,13 +648,13 @@ class Monitoring_ListController extends Controller
$editor->setSearchColumns($searchColumns); $editor->setSearchColumns($searchColumns);
} }
$editor->handleRequest($this->getRequest()); $editor->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter()); $dataView->applyFilter($editor->getFilter());
$this->setupFilterControl($editor); $this->setupFilterControl($editor);
$this->view->filter = $editor->getFilter(); $this->view->filter = $editor->getFilter();
$this->handleFormatRequest($query); $this->handleFormatRequest($dataView);
return $query; return $dataView;
} }
/** /**