From e602717bd96bfce12f65cf8d0ebe23469033eb50 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 21 Jan 2015 09:15:07 +0100 Subject: [PATCH] monitoring: Sort by display_names instead of name1 and name2 by default in the services overview refs #7843 --- .../library/Monitoring/DataView/ServiceStatus.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index 9edcabc87..9ecc8e309 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -25,6 +25,7 @@ class ServiceStatus extends DataView { return array( 'host_name', + 'host_display_name', 'host_state', 'host_state_type', 'host_last_state_change', @@ -123,17 +124,17 @@ class ServiceStatus extends DataView public function getSortRules() { return array( - 'host_name' => array( + 'host_display_name' => array( 'columns' => array( - 'service_host_name', - 'service_description' + 'host_display_name', + 'service_display_name' ), 'order' => self::SORT_ASC ), 'host_address' => array( 'columns' => array( 'host_ipv4', - 'service_description' + 'service_display_name' ), 'order' => self::SORT_ASC ),