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.'), ) ); 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(); } diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index 9ecc8e309..a4c9cfee8 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -138,9 +138,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',