From 4db9629268031048f70d2c29e8ee9c01d78a325b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 15 Jun 2015 16:26:07 +0200
Subject: [PATCH] AlertsummaryController: Apply object restrictions

refs #9009
---
 .../controllers/AlertsummaryController.php        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
index e8ae0828c..23cc17442 100644
--- a/modules/monitoring/application/controllers/AlertsummaryController.php
+++ b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -70,6 +70,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
         $this->view->notifications = $query;
 
         $this->setupLimitControl();
@@ -91,8 +92,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -139,8 +141,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -206,8 +209,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_start_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -256,6 +260,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'timestamp'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
         $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
@@ -321,8 +326,9 @@ class Monitoring_AlertsummaryController extends Controller
                 'acknowledgement_entry_time'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
-        $query->setFilter(
+        $query->addFilter(
             new Icinga\Data\Filter\FilterExpression(
                 'notification_start_time',
                 '>=',
@@ -490,6 +496,7 @@ class Monitoring_AlertsummaryController extends Controller
                 'notification_state'
             )
         );
+        $this->applyRestriction('monitoring/filter/objects', $query);
 
         $query->order('notification_start_time', 'desc');