From 149e893ecdb8fea16c225d5e95c4fb1f3f004747 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 15 May 2015 10:54:30 +0200 Subject: [PATCH] Revert "Make ascending sort by host or service severity initiatable" This reverts commit 7e1f9f6dccc1085bc1066e6152e548d854050fac. --- .../library/Monitoring/DataView/HostStatus.php | 7 +++---- .../library/Monitoring/DataView/ServiceStatus.php | 14 ++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php index a84098aa4..23df6d94a 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php @@ -94,11 +94,10 @@ class HostStatus extends DataView ), 'host_severity' => array( 'columns' => array( - 'host_severity', - 'host_last_state_change', + 'host_severity DESC', + 'host_last_state_change DESC', 'host_display_name ASC' - ), - 'order' => self::SORT_DESC + ) ), 'host_address' => array( 'columns' => array( diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index 4d4d617ab..b4f1038da 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -130,21 +130,19 @@ class ServiceStatus extends DataView ), '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' - ), - 'order' => self::SORT_DESC + ) ), 'host_severity' => array( 'columns' => array( - 'host_severity', - 'host_last_state_change', + 'host_severity DESC', + 'host_last_state_change DESC', 'host_display_name ASC', 'service_display_name ASC' - ), - 'order' => self::SORT_DESC + ) ), 'host_display_name' => array( 'columns' => array(