monitoring: Remove HostcommentQuery::getGroup()

refs #9956
Icinga · Sep 29, 2015 · 2ce63ad · 2ce63ad
1 parent c597a67
commit 2ce63ad
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcommentQuery.php
@@ -13,6 +13,16 @@ class HostcommentQuery extends IdoQuery
      */
     protected $allowCustomVars = true;
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $groupBase = array('comments' => array('c.comment_id', 'ho.object_id'));
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $groupOrigin = array('hostgroups', 'services');
+
     /**
      * {@inheritdoc}
      */
@@ -165,28 +175,4 @@ protected function joinInstances()
             array()
         );
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroup()
-    {
-        $group = array();
-        if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('services')) {
-            $group = array('c.comment_id', 'ho.object_id');
-            if ($this->hasJoinedVirtualTable('hosts')) {
-                $group[] = 'h.host_id';
-            }
-
-            if ($this->hasJoinedVirtualTable('hoststatus')) {
-                $group[] = 'hs.hoststatus_id';
-            }
-
-            if ($this->hasJoinedVirtualTable('instances')) {
-                $group[] = 'i.instance_id';
-            }
-        }
-
-        return $group;
-    }
 }