tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-21 04:44:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

FilterEditor: Apply the filter on the query internally

Browse Source 
refs #9029
This commit is contained in:
Johannes Meyer 2015-08-13 11:33:25 +02:00
parent 069fcc40ea
commit fc35f3e46b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Web/Widget/FilterEditor.php
View File

@ -284,6 +284,11 @@ class FilterEditor extends AbstractWidget
if ($add) { if ($add) {
$this->addFilterToId($add); $this->addFilterToId($add);
} }
if ($request->isGet()) {
$this->query->applyFilter($this->getFilter());
}
return $this; return $this;
} }

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

@ -625,7 +625,6 @@ class Monitoring_ListController extends Controller
->ignoreParams('page') ->ignoreParams('page')
->setSearchColumns($dataView->getSearchColumns()) ->setSearchColumns($dataView->getSearchColumns())
->handleRequest($this->getRequest()); ->handleRequest($this->getRequest());
$dataView->applyFilter($editor->getFilter());
$this->setupFilterControl($editor); $this->setupFilterControl($editor);
$this->view->filter = $editor->getFilter(); $this->view->filter = $editor->getFilter();