From 03c8de5d7b773aa3c78271946501f0a64e6155fb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 12:20:28 +0200 Subject: [PATCH] ContactgroupQuery: Provide case-insensitive filter column `service_host' refs #8613 --- .../library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php | 1 + modules/monitoring/library/Monitoring/DataView/Contactgroup.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php index 6e7e38f0f..8a29e1954 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php @@ -39,6 +39,7 @@ class ContactgroupQuery extends IdoQuery 'services' => array( 'service' => 'so.name2 COLLATE latin1_general_ci', 'service_description' => 'so.name2', + 'service_host' => 'so.name1 COLLATE latin1_general_ci', 'service_host_name' => 'so.name1' ) ); diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php index 287b835f2..0c432c2dc 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php @@ -61,6 +61,6 @@ class Contactgroup extends DataView public function getFilterColumns() { - return array('contactgroup', 'contact', 'host', 'service'); + return array('contactgroup', 'contact', 'host', 'service', 'service_host'); } }