From f61370f55a134f3e37faa2b9f1ffc4b81f6c21bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 10 Apr 2015 15:21:18 +0200
Subject: [PATCH] DataView\Hostgroup: Add missing query columns

refs #8613
---
 .../Backend/Ido/Query/HostgroupQuery.php           |  2 +-
 .../library/Monitoring/DataView/Hostgroup.php      | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
index 219479745..d41a9e00b 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
@@ -10,7 +10,7 @@ class HostgroupQuery extends IdoQuery
             'hostgroups'      => 'hgo.name1 COLLATE latin1_general_ci',
             'hostgroup_name'  => 'hgo.name1',
             'hostgroup_alias' => 'hg.alias',
-            'id'              => 'hg.hostgroup_id',
+            'hostgroup_id'    => 'hg.hostgroup_id'
         ),
         'hosts' => array(
             'host'            => 'ho.name1 COLLATE latin1_general_ci',
diff --git a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
index 84beb4bf0..c139d8977 100644
--- a/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
+++ b/modules/monitoring/library/Monitoring/DataView/Hostgroup.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-
 namespace Icinga\Module\Monitoring\DataView;
 
 /**
@@ -17,9 +16,10 @@ class Hostgroup extends DataView
     public function getColumns()
     {
         return array(
-            'host',
             'hostgroup_name',
-            'hostgroup_alias'
+            'hostgroup_alias',
+            'hostgroup_id',
+            'host_name'
         );
     }
 
@@ -33,7 +33,15 @@ class Hostgroup extends DataView
         return array(
             'hostgroup_name' => array(
                 'order' => self::SORT_ASC
+            ),
+            'hostgroup_alias' => array(
+                'order' => self::SORT_ASC
             )
         );
     }
+
+    public function getFilterColumns()
+    {
+        return array('hostgroup', 'host');
+    }
 }