From e93628f4b421384c56d807afd24ac25e2169a640 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 20 Jan 2015 16:53:27 +0100 Subject: [PATCH 1/3] Prefer 'hostname' over 'host name' in the LdapDiscoveryForm --- application/forms/LdapDiscoveryForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php index ea5f3a99e..6a14c2ecd 100644 --- a/application/forms/LdapDiscoveryForm.php +++ b/application/forms/LdapDiscoveryForm.php @@ -48,7 +48,7 @@ class LdapDiscoveryForm extends Form array( 'required' => false, 'label' => $this->translate('Host'), - 'description' => $this->translate('IP or host name to search.'), + 'description' => $this->translate('IP or hostname to search.'), ) ); From 9e8c897d6faec2860e3cbc8fe9866f3ed7d1ac22 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 21 Jan 2015 09:13:10 +0100 Subject: [PATCH 2/3] monitoring: Order a data view before dumping --- modules/monitoring/library/Monitoring/DataView/DataView.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php index 1fdd8b4f9..5900df737 100644 --- a/modules/monitoring/library/Monitoring/DataView/DataView.php +++ b/modules/monitoring/library/Monitoring/DataView/DataView.php @@ -83,6 +83,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable public function dump() { + $this->order(); return $this->query->dump(); } From 5df6828889618a4924d37c8b1e14c08aa7c7c99f Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 21 Jan 2015 09:31:38 +0100 Subject: [PATCH 3/3] monitoring: Remove ununsed sort rule in the ServiceStatus --- .../monitoring/library/Monitoring/DataView/ServiceStatus.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index 9edcabc87..e90caef9e 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -137,9 +137,6 @@ class ServiceStatus extends DataView ), 'order' => self::SORT_ASC ), - 'host_last_state_change' => array( - 'order' => self::SORT_ASC - ), 'host_severity' => array( 'columns' => array( 'host_severity',