tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DataView: Apply object restrictions to dynamic filter columns"

Browse Source 
This reverts commit 9ec471d34965198d2cfd5f2b9a6bbb76883023e0.

refs #9993
This commit is contained in:
Johannes Meyer 2016-11-15 12:47:54 +01:00
parent 7c83db08a3
commit 8978ad9f79
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/monitoring/library/Monitoring/DataView/DataView.php
View File

@ -5,7 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
use IteratorAggregate; use IteratorAggregate;
use Icinga\Application\Hook; use Icinga\Application\Hook;
use Icinga\Authentication\Auth;
use Icinga\Data\ConnectionInterface; use Icinga\Data\ConnectionInterface;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Data\Filter\FilterMatch; use Icinga\Data\Filter\FilterMatch;
@ -265,24 +264,12 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
return $columns; return $columns;
} }
$restriction = Filter::matchAny();
$restrictions = Auth::getInstance()->getRestrictions('monitoring/filter/objects');
foreach ($restrictions as $filter) {
if ($filter === '*') {
$restriction = Filter::matchAny();
break;
}
$restriction->addFilter(Filter::fromQueryString($filter));
}
$query = MonitoringBackend::instance() $query = MonitoringBackend::instance()
->select() ->select()
->from('customvar', array('varname', 'object_type')) ->from('customvar', array('varname', 'object_type'))
->where('is_json', 0) ->where('is_json', 0)
->where('object_type_id', array(1, 2)) ->where('object_type_id', array(1, 2))
->applyFilter($restriction)
->getQuery()->group(array('varname', 'object_type')); ->getQuery()->group(array('varname', 'object_type'));
foreach ($query as $row) { foreach ($query as $row) {
if ($row->object_type === 'host') { if ($row->object_type === 'host') {
$label = t('Host') . ' ' . ucwords(str_replace('_', ' ', $row->varname)); $label = t('Host') . ' ' . ucwords(str_replace('_', ' ', $row->varname));