From 03d85ac6aeb56097af79761b6b803707cfe225d4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 13 Mar 2015 17:13:52 +0100
Subject: [PATCH] Sort by service_display_name too when sorting by
service_severity
refs #8716
---
.../Monitoring/DataView/ServiceStatus.php | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
index 5c37e45ee..3e3a1c616 100644
--- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
+++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
@@ -125,17 +125,26 @@ class ServiceStatus extends DataView
return array(
'service_severity' => array(
'columns' => array(
- 'service_severity',
- 'service_last_state_change'
+ 'service_severity DESC',
+ 'service_last_state_change DESC',
+ 'service_display_name ASC',
+ 'host_display_name ASC'
+ )
+ ),
+ 'service_display_name' => array(
+ 'columns' => array(
+ 'service_display_name',
+ 'host_display_name'
),
- 'order' => self::SORT_DESC
+ 'order' => self::SORT_ASC
),
'host_severity' => array(
'columns' => array(
- 'host_severity',
- 'host_last_state_change',
- ),
- 'order' => self::SORT_ASC
+ 'host_severity DESC',
+ 'host_last_state_change DESC',
+ 'host_display_name ASC',
+ 'service_display_name ASC'
+ )
),
'host_display_name' => array(
'columns' => array(