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

Merge branch 'bugfix/multiselect-restrictions-9574' 

fixes #9574
This commit is contained in:
Eric Lippmann 2015-08-04 16:47:15 +02:00
parent 0e14cb48da cdd13bc389
commit bebff5b83e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/controllers/HostsController.php
View File

@ -27,8 +27,8 @@ class Monitoring_HostsController extends Controller
public function init() public function init()
{ {
$hostList = new HostList($this->backend); $hostList = new HostList($this->backend);
$hostList->setFilter(Filter::fromQueryString((string) $this->params));
$this->applyRestriction('monitoring/filter/objects', $hostList); $this->applyRestriction('monitoring/filter/objects', $hostList);
$hostList->addFilter(Filter::fromQueryString((string) $this->params));
$this->hostList = $hostList; $this->hostList = $hostList;
$this->getTabs()->add( $this->getTabs()->add(
'show', 'show',

4
modules/monitoring/application/controllers/ServicesController.php
View File

@ -27,10 +27,10 @@ class Monitoring_ServicesController extends Controller
public function init() public function init()
{ {
$serviceList = new ServiceList($this->backend); $serviceList = new ServiceList($this->backend);
$serviceList->setFilter(Filter::fromQueryString( $this->applyRestriction('monitoring/filter/objects', $serviceList);
$serviceList->addFilter(Filter::fromQueryString(
(string) $this->params->without(array('service_problem', 'service_handled', 'view')) (string) $this->params->without(array('service_problem', 'service_handled', 'view'))
)); ));
$this->applyRestriction('monitoring/filter/objects', $serviceList);
$this->serviceList = $serviceList; $this->serviceList = $serviceList;
$this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services'); $this->view->listAllLink = Url::fromRequest()->setPath('monitoring/list/services');
$this->getTabs()->add( $this->getTabs()->add(

2
modules/monitoring/library/Monitoring/Object/ObjectList.php
View File

@ -83,7 +83,7 @@ abstract class ObjectList implements Countable, IteratorAggregate, Filterable
public function getFilter() public function getFilter()
{ {
if ($this->filter === null) { if ($this->filter === null) {
$this->filter = Filter::matchAny(); $this->filter = Filter::matchAll();
} }
return $this->filter; return $this->filter;