tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

AlertsummaryController: Apply object restrictions

Browse Source 
refs #9009
This commit is contained in:
Johannes Meyer 2015-06-15 16:26:07 +02:00
parent 5545b4a605
commit 4db9629268
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -70,6 +70,7 @@ class Monitoring_AlertsummaryController extends Controller
'notification_state' 'notification_state'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$this->view->notifications = $query; $this->view->notifications = $query;
$this->setupLimitControl(); $this->setupLimitControl();
@ -91,8 +92,9 @@ class Monitoring_AlertsummaryController extends Controller
'notification_start_time' 'notification_start_time'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->setFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new Icinga\Data\Filter\FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
@ -139,8 +141,9 @@ class Monitoring_AlertsummaryController extends Controller
'notification_start_time' 'notification_start_time'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->setFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new Icinga\Data\Filter\FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
@ -206,8 +209,9 @@ class Monitoring_AlertsummaryController extends Controller
'notification_start_time' 'notification_start_time'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->setFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new Icinga\Data\Filter\FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
@ -256,6 +260,7 @@ class Monitoring_AlertsummaryController extends Controller
'timestamp' 'timestamp'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new Icinga\Data\Filter\FilterExpression(
@ -321,8 +326,9 @@ class Monitoring_AlertsummaryController extends Controller
'acknowledgement_entry_time' 'acknowledgement_entry_time'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->setFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new Icinga\Data\Filter\FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
@ -490,6 +496,7 @@ class Monitoring_AlertsummaryController extends Controller
'notification_state' 'notification_state'
) )
); );
$this->applyRestriction('monitoring/filter/objects', $query);
$query->order('notification_start_time', 'desc'); $query->order('notification_start_time', 'desc');