diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php index 22329cd7a..0d3917e90 100644 --- a/modules/monitoring/application/controllers/AlertsummaryController.php +++ b/modules/monitoring/application/controllers/AlertsummaryController.php @@ -64,7 +64,7 @@ class Monitoring_AlertsummaryController extends Controller 'service_description', 'service_display_name', 'notification_output', - 'notification_contact', + 'notification_contact_name', 'notification_start_time', 'notification_state' ) @@ -482,7 +482,7 @@ class Monitoring_AlertsummaryController extends Controller 'service_description', 'service_display_name', 'notification_output', - 'notification_contact', + 'notification_contact_name', 'notification_start_time', 'notification_state' ) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index ef0ee4db2..b06291c67 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -328,7 +328,7 @@ class Monitoring_ListController extends Controller 'host_name', 'service_description', 'notification_output', - 'notification_contact', + 'notification_contact_name', 'notification_start_time', 'notification_state', 'host_display_name', diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index f89b70d07..0d7df501a 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -159,7 +159,7 @@ class Monitoring_ShowController extends Controller 'host_name', 'service_description', 'notification_output', - 'notification_contact', + 'notification_contact_name', 'notification_start_time', 'notification_state', 'host_display_name', diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml index b9fd7e309..9a3b424b4 100644 --- a/modules/monitoring/application/views/scripts/list/notifications.phtml +++ b/modules/monitoring/application/views/scripts/list/notifications.phtml @@ -61,9 +61,9 @@ use Icinga\Module\Monitoring\Object\Service; translate('Sent to %s'), $this->qlink( - $notification->notification_contact, + $notification->notification_contact_name, 'monitoring/show/contact', - array('contact_name' => $notification->notification_contact) + array('contact_name' => $notification->notification_contact_name) ) ) ?> diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php index 41526f612..3496ca9e2 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php @@ -17,7 +17,7 @@ class NotificationQuery extends IdoQuery 'service_description' => 'o.name2' ), 'contact' => array( - 'notification_contact' => 'c_o.name1', + 'notification_contact_name' => 'c_o.name1', 'contact_object_id' => 'c_o.object_id' ), 'command' => array( diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php index 0eb761ae3..757334063 100644 --- a/modules/monitoring/library/Monitoring/DataView/Notification.php +++ b/modules/monitoring/library/Monitoring/DataView/Notification.php @@ -17,7 +17,7 @@ class Notification extends DataView 'service_description', 'notification_state', 'notification_start_time', - 'notification_contact', + 'notification_contact_name', 'notification_output', 'notification_command', 'host_display_name',