[icinga-checkins] icinga.org: icingaweb2/master: Revert "DataView: Apply object restrictions to dynamic filter columns"

git at icinga.org git at icinga.org
Tue Nov 15 12:48:53 CET 2016


Module: icingaweb2
Branch: master
Commit: 8978ad9f79d3173a53a7b85f52ccec8411b27052
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=8978ad9f79d3173a53a7b85f52ccec8411b27052

Author: Johannes Meyer <johannes.meyer at netways.de>
Date:   Tue Nov 15 12:47:54 2016 +0100

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

This reverts commit 9ec471d34965198d2cfd5f2b9a6bbb76883023e0.

refs #9993

---

 .../monitoring/library/Monitoring/DataView/DataView.php   |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
index 1f63c78..e714698 100644
--- a/modules/monitoring/library/Monitoring/DataView/DataView.php
+++ b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -5,7 +5,6 @@ namespace Icinga\Module\Monitoring\DataView;
 
 use IteratorAggregate;
 use Icinga\Application\Hook;
-use Icinga\Authentication\Auth;
 use Icinga\Data\ConnectionInterface;
 use Icinga\Data\Filter\Filter;
 use Icinga\Data\Filter\FilterMatch;
@@ -265,24 +264,12 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
             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()
             ->select()
             ->from('customvar', array('varname', 'object_type'))
             ->where('is_json', 0)
             ->where('object_type_id', array(1, 2))
-            ->applyFilter($restriction)
             ->getQuery()->group(array('varname', 'object_type'));
-
         foreach ($query as $row) {
             if ($row->object_type === 'host') {
                 $label = t('Host') . ' ' . ucwords(str_replace('_', ' ', $row->varname));



More information about the icinga-checkins mailing list