tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bugfix/prefer-display_name-over-name1-name2-7843

Browse Source
This commit is contained in:
Eric Lippmann 2015-01-21 09:36:41 +01:00
commit eb6591c176
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/LdapDiscoveryForm.php
View File

@ -48,7 +48,7 @@ class LdapDiscoveryForm extends Form
array( array(
'required' => false, 'required' => false,
'label' => $this->translate('Host'), 'label' => $this->translate('Host'),
'description' => $this->translate('IP or host name to search.'), 'description' => $this->translate('IP or hostname to search.'),
) )
); );

1
modules/monitoring/library/Monitoring/DataView/DataView.php
View File

@ -83,6 +83,7 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable
public function dump() public function dump()
{ {
$this->order();
return $this->query->dump(); return $this->query->dump();
} }

3
modules/monitoring/library/Monitoring/DataView/ServiceStatus.php
View File

@ -138,9 +138,6 @@ class ServiceStatus extends DataView
), ),
'order' => self::SORT_ASC 'order' => self::SORT_ASC
), ),
'host_last_state_change' => array(
'order' => self::SORT_ASC
),
'host_severity' => array( 'host_severity' => array(
'columns' => array( 'columns' => array(
'host_severity', 'host_severity',