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

ListController: Fix servicegrid grouping when applying group restrictions 

Quickfix only.

refs #10316
This commit is contained in:
Johannes Meyer 2015-11-13 11:40:51 +01:00
parent b182a31b90
commit cc37ca37d9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/controllers/ListController.php
View File

@ -545,6 +545,7 @@ class ListController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$this->filterQuery($query); $this->filterQuery($query);
$filter = (bool) $this->params->shift('problems', false) ? Filter::where('service_problem', 1) : null; $filter = (bool) $this->params->shift('problems', false) ? Filter::where('service_problem', 1) : null;
$query->getQuery()->setGroupBase(array());
$pivot = $query $pivot = $query
->pivot( ->pivot(
'service_description', 'service_description',

6
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -990,6 +990,12 @@ abstract class IdoQuery extends DbQuery
return $this; return $this;
} }
public function setGroupBase(array $groupBase)
{
$this->groupBase = $groupBase;
return $this;
}
/** /**
* Register the GROUP BY columns required for the given alias * Register the GROUP BY columns required for the given alias
* *