tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DataView\Hostgroup: Add missing query columns 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-10 15:21:18 +02:00
parent 69e520a514
commit f61370f55a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
View File

@ -10,7 +10,7 @@ class HostgroupQuery extends IdoQuery
'hostgroups' => 'hgo.name1 COLLATE latin1_general_ci', 'hostgroups' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1', 'hostgroup_name' => 'hgo.name1',
'hostgroup_alias' => 'hg.alias', 'hostgroup_alias' => 'hg.alias',
'id' => 'hg.hostgroup_id', 'hostgroup_id' => 'hg.hostgroup_id'
), ),
'hosts' => array( 'hosts' => array(
'host' => 'ho.name1 COLLATE latin1_general_ci', 'host' => 'ho.name1 COLLATE latin1_general_ci',

14
modules/monitoring/library/Monitoring/DataView/Hostgroup.php
View File

@ -1,7 +1,6 @@
<?php <?php
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */ /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\DataView; namespace Icinga\Module\Monitoring\DataView;
/** /**
@ -17,9 +16,10 @@ class Hostgroup extends DataView
public function getColumns() public function getColumns()
{ {
return array( return array(
'host',
'hostgroup_name', 'hostgroup_name',
'hostgroup_alias' 'hostgroup_alias',
'hostgroup_id',
'host_name'
); );
} }
@ -33,7 +33,15 @@ class Hostgroup extends DataView
return array( return array(
'hostgroup_name' => array( 'hostgroup_name' => array(
'order' => self::SORT_ASC 'order' => self::SORT_ASC
),
'hostgroup_alias' => array(
'order' => self::SORT_ASC
) )
); );
} }
public function getFilterColumns()
{
return array('hostgroup', 'host');
}
} }