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

Merge pull request #3671 from Icinga/bugfix/getrestriction 

Monitoring\Controller#getRestriction(): return filters matching all, not none
This commit is contained in:
Johannes Meyer 2019-04-16 08:06:55 +02:00 committed by GitHub
parent d8c4fcc517 d40e85b8a3
commit 1cce44453c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/monitoring/library/Monitoring/Controller.php
View File

@ -97,7 +97,7 @@ class Controller extends IcingaWebController
*
* @param string $name Name of the restriction
*
* @return Filter|null Filter object or null if the authenticated user is not restricted
* @return Filter Filter object
* @throws ConfigurationError If the restriction contains invalid filter columns
*/
protected function getRestriction($name)
@ -115,7 +115,7 @@ class Controller extends IcingaWebController
));
foreach ($this->getRestrictions($name) as $filter) {
if ($filter === '*') {
return Filter::matchAny();
return Filter::matchAll();
}
try {
$restriction->addFilter(Filter::fromQueryString($filter));
@ -138,6 +138,11 @@ class Controller extends IcingaWebController
);
}
}
if ($restriction->isEmpty()) {
return Filter::matchAll();
}
return $restriction;
}
}