tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NotificationQuery: Use query column `notification_contact_name' 

...instead of `notification_contact'.

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-13 15:26:06 +02:00
parent 15399d77ce
commit 644a386bf8
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'
)

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

@ -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',

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

@ -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',

4
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -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>

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

@ -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(

2
modules/monitoring/library/Monitoring/DataView/Notification.php
View File

@ -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',