tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ServicestatusQuery: Respect an already set group clause

Browse Source 
refs #7344
This commit is contained in:
Johannes Meyer 2015-08-12 13:40:17 +02:00
parent 5ae5b5e8d3
commit dc7d3a9c92
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

@ -362,9 +362,15 @@ class ServicestatusQuery extends IdoQuery
*/ */
public function getGroup() public function getGroup()
{ {
$group = array(); $group = parent::getGroup() ?: array();
if (! is_array($group)) {
$group = array($group);
}
if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) { if ($this->hasJoinedVirtualTable('hostgroups') || $this->hasJoinedVirtualTable('servicegroups')) {
$group = array('s.service_id', 'so.object_id'); $group[] = 's.service_id';
$group[] = 'so.object_id';
if ($this->hasJoinedVirtualTable('hosts')) { if ($this->hasJoinedVirtualTable('hosts')) {
$group[] = 'h.host_id'; $group[] = 'h.host_id';
} }