NotificationQuery: Use query column `notification_contact_name'

...instead of `notification_contact'. refs #8613
Icinga · Apr 13, 2015 · 644a386 · 644a386
1 parent 15399d7
commit 644a386
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/modules/monitoring/application/controllers/AlertsummaryController.php b/modules/monitoring/application/controllers/AlertsummaryController.php
@@ -64,7 +64,7 @@ public function indexAction()
                 'service_description',
                 'service_display_name',
                 'notification_output',
-                'notification_contact',
+                'notification_contact_name',
                 'notification_start_time',
                 'notification_state'
             )
@@ -482,7 +482,7 @@ private function createRecentAlerts()
                 '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
@@ -328,7 +328,7 @@ public function notificationsAction()
             '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
@@ -159,7 +159,7 @@ public function contactAction()
                 '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
@@ -61,9 +61,9 @@ use Icinga\Module\Monitoring\Object\Service;
                         <?= sprintf(
                             $this->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)
                             )
                         ) ?>
                     </small>

diff --git 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
@@ -17,7 +17,7 @@ public function getColumns()
             'service_description',
             'notification_state',
             'notification_start_time',
-            'notification_contact',
+            'notification_contact_name',
             'notification_output',
             'notification_command',
             'host_display_name',