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

Fix error in the contact detail view introduced by changes to the notification queries

Browse Source
This commit is contained in:
Eric Lippmann 2016-09-15 14:07:19 +02:00
parent fd6ae75803
commit c547f4c17f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/controllers/ListController.php
View File

@ -292,7 +292,7 @@ class ListController extends Controller
$this->setupPaginationControl($notifications); $this->setupPaginationControl($notifications);
$this->setupLimitControl(); $this->setupLimitControl();
$this->setupSortControl(array( $this->setupSortControl(array(
'notification_start_time' => $this->translate('Notification Start') 'notification_timestamp' => $this->translate('Notification Start')
), $notifications); ), $notifications);
$this->view->notifications = $notifications; $this->view->notifications = $notifications;

5
modules/monitoring/application/controllers/ShowController.php
View File

@ -29,7 +29,6 @@ class ShowController extends Controller
'contact_alias', 'contact_alias',
'contact_email', 'contact_email',
'contact_pager', 'contact_pager',
'contact_object_id',
'contact_notify_service_timeperiod', 'contact_notify_service_timeperiod',
'contact_notify_service_recovery', 'contact_notify_service_recovery',
'contact_notify_service_warning', 'contact_notify_service_warning',
@ -61,13 +60,13 @@ class ShowController extends Controller
'service_description', 'service_description',
'notification_output', 'notification_output',
'notification_contact_name', 'notification_contact_name',
'notification_start_time', 'notification_timestamp',
'notification_state', 'notification_state',
'host_display_name', 'host_display_name',
'service_display_name' 'service_display_name'
)); ));
$notifications->where('contact_object_id', $contact->contact_object_id); $notifications->where('notification_contact_name', $contactName);
$this->applyRestriction('monitoring/filter/objects', $notifications); $this->applyRestriction('monitoring/filter/objects', $notifications);
$this->view->notifications = $notifications; $this->view->notifications = $notifications;
$this->setupLimitControl(); $this->setupLimitControl();

1
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

@ -24,7 +24,6 @@ class NotificationQuery extends IdoQuery
'notifications' => array( 'notifications' => array(
'instance_name' => 'n.instance_name', 'instance_name' => 'n.instance_name',
'notification_contact_name' => 'n.notification_contact_name', 'notification_contact_name' => 'n.notification_contact_name',
'notification_object_id' => 'n.notification_object_id',
'notification_output' => 'n.notification_output', 'notification_output' => 'n.notification_output',
'notification_state' => 'n.notification_state', 'notification_state' => 'n.notification_state',
'notification_timestamp' => 'n.notification_timestamp' 'notification_timestamp' => 'n.notification_timestamp'