NotificationQuery: Use query column `service_description' instead of …

…`service' refs #8613
Icinga · Apr 13, 2015 · 15399d7 · 15399d7
1 parent 96954ea
commit 15399d7
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
@@ -61,7 +61,7 @@ public function indexAction()
             array(
                 'host_name',
                 'host_display_name',
-                'service',
+                'service_description',
                 'service_display_name',
                 'notification_output',
                 'notification_contact',
@@ -479,7 +479,7 @@ private function createRecentAlerts()
             array(
                 'host_name',
                 'host_display_name',
-                'service',
+                'service_description',
                 'service_display_name',
                 'notification_output',
                 'notification_contact',

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -326,7 +326,7 @@ public function notificationsAction()
         $this->setAutorefreshInterval(15);
         $query = $this->backend->select()->from('notification', array(
             'host_name',
-            'service',
+            'service_description',
             'notification_output',
             'notification_contact',
             'notification_start_time',

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
@@ -157,7 +157,7 @@ public function contactAction()
 
             $notifications = $this->backend->select()->from('notification', array(
                 'host_name',
-                'service',
+                'service_description',
                 'notification_output',
                 'notification_contact',
                 'notification_start_time',

diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -24,7 +24,7 @@ use Icinga\Module\Monitoring\Object\Service;
     <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($notifications as $notification):
-        if (isset($notification->service)) {
+        if (isset($notification->service_description)) {
             $isService = true;
             $stateName = Service::getStateText($notification->notification_state);
         } else {
@@ -44,7 +44,7 @@ use Icinga\Module\Monitoring\Object\Service;
                 <?php if ($isService): ?>
                     <?= $this->icon('service', $this->translate('Service')); ?>
                     <?= $this->link()->service(
-                        $notification->service,
+                        $notification->service_description,
                         $notification->service_display_name,
                         $notification->host_name,
                         $notification->host_display_name

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
@@ -14,7 +14,7 @@ class NotificationQuery extends IdoQuery
         ),
         'objects' => array(
             'host_name'                     => 'o.name1',
-            'service'                       => 'o.name2'
+            'service_description'           => 'o.name2'
         ),
         'contact' => array(
             'notification_contact'          => 'c_o.name1',

diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php
@@ -14,7 +14,7 @@ public function getColumns()
     {
         return array(
             'host_name',
-            'service',
+            'service_description',
             'notification_state',
             'notification_start_time',
             'notification_contact',