From 3d7e418032a80603738e08ea21d9eeaf02ccc4ae Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 09:50:26 +0200 Subject: [PATCH] ContactQuery: Provide case insensitive filter column `service_host' refs #8613 --- .../library/Monitoring/Backend/Ido/Query/ContactQuery.php | 3 ++- modules/monitoring/library/Monitoring/DataView/Contact.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php index e4bdc88ea..ce00b6151 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php @@ -42,7 +42,8 @@ class ContactQuery extends IdoQuery 'services' => array( 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2', - 'service_host_name' => 'so.name1', + 'service_host' => 'so.name1 COLLATE latin1_general_ci', + 'service_host_name' => 'so.name1' ) ); diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php index b70dcebc7..3a364b968 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contact.php +++ b/modules/monitoring/library/Monitoring/DataView/Contact.php @@ -61,6 +61,6 @@ class Contact extends DataView public function getFilterColumns() { - return array('contact', 'alias', 'email', 'host', 'service'); + return array('contact', 'alias', 'email', 'host', 'service', 'service_host'); } }