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

monitoring\ListController: handle filter editing 

Handle filter modifications in one place. We still should try to
abstract this on step farther.
This commit is contained in:
Thomas Gelf 2014-06-20 13:26:10 +02:00
parent 0642c9d33c
commit 371b66bd8b
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,10 +113,6 @@ class Monitoring_ListController extends Controller
$this->view->showHost = false; $this->view->showHost = false;
} }
} }
// if ($this->view->showHost) {
$this->url->shift('service');
//}
$this->view->query = $this->_request->getQuery();
$this->setAutorefreshInterval(10); $this->setAutorefreshInterval(10);
$columns = array_merge(array( $columns = array_merge(array(
@ -446,17 +442,34 @@ class Monitoring_ListController extends Controller
$view = $params->shift('view'); $view = $params->shift('view');
$backend = $params->shift('backend'); $backend = $params->shift('backend');
$modifyFilter = $params->shift('modifyFilter', false); $modifyFilter = $params->shift('modifyFilter', false);
$removeFilter = $params->shift('removeFilter', false);
$filter = Filter::fromQueryString((string) $params); $filter = Filter::fromQueryString((string) $params);
$query->applyFilter($filter); $this->view->filterPreview = Widget::create('filterWidget', $filter);
if ($removeFilter) {
$redirect = $this->url->without('page');
if ($filter->getById($removeFilter)->isRootNode()) {
$redirect->setQueryString('');
} else {
$filter->removeId($removeFilter);
$redirect->setQueryString($filter->toQueryString())
->getParams()->add('modifyFilter');;
}
$this->redirectNow($redirect);
}
if ($modifyFilter) { if ($modifyFilter) {
$this->view->filterWidget = Widget::create('filterEditor', array( if ($this->_request->isPost()) {
$filter = $filter->applyChanges($_POST);
$this->redirectNow($this->url->without('page')->setQueryString($filter->toQueryString()));
}
$this->view->filterEditor = Widget::create('filterEditor', array(
'filter' => $filter, 'filter' => $filter,
'query' => $query 'query' => $query
)); ));
} else {
$this->view->filterWidget = Widget::create('filterWidget', $filter);
} }
$query->applyFilter($filter);
$this->view->filter = $filter; $this->view->filter = $filter;
if ($sort) { if ($sort) {
$query->order($sort, $dir); $query->order($sort, $dir);