From 9cc546930515eff34b2628e840a3365739ce4dd2 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 13 Apr 2015 15:33:33 +0200 Subject: [PATCH] NotificationQuery: Provide case-insensitive filter column `contact' refs #8613 --- .../library/Monitoring/Backend/Ido/Query/NotificationQuery.php | 1 + modules/monitoring/library/Monitoring/DataView/Notification.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php index db267fbc9..0133dc637 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php @@ -19,6 +19,7 @@ class NotificationQuery extends IdoQuery 'service_description' => 'o.name2' ), 'contact' => array( + 'contact' => 'c_o.name1 COLLATE latin1_general_ci', 'notification_contact_name' => 'c_o.name1', 'contact_object_id' => 'c_o.object_id' ), diff --git a/modules/monitoring/library/Monitoring/DataView/Notification.php b/modules/monitoring/library/Monitoring/DataView/Notification.php index f84eaddf0..48d8fd058 100644 --- a/modules/monitoring/library/Monitoring/DataView/Notification.php +++ b/modules/monitoring/library/Monitoring/DataView/Notification.php @@ -37,6 +37,6 @@ class Notification extends DataView public function getFilterColumns() { - return array('host', 'service'); + return array('host', 'service', 'contact'); } }