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

Fix grouping in the new contact queries

Browse Source 
refs #3088
This commit is contained in:
Eric Lippmann 2018-07-18 15:20:05 +02:00
parent 5befab6a2b
commit d5d336884c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcontactQuery.php
View File

@ -10,7 +10,10 @@ class HostcontactQuery extends IdoQuery
{ {
protected $allowCustomVars = true; protected $allowCustomVars = true;
protected $groupBase = ['contacts' => ['co.object_id', 'c.contact_id'], 'timeperiods' => ['ht.timeperiod_id']]; protected $groupBase = [
'contacts' => ['co.object_id', 'c.contact_id'],
'timeperiods' => ['ht.timeperiod_id', 'st.timeperiod_id']
];
protected $groupOrigin = ['contactgroups', 'hosts', 'services']; protected $groupOrigin = ['contactgroups', 'hosts', 'services'];

5
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecontactQuery.php
View File

@ -10,7 +10,10 @@ class ServicecontactQuery extends IdoQuery
{ {
protected $allowCustomVars = true; protected $allowCustomVars = true;
protected $groupBase = ['contacts' => ['co.object_id', 'c.contact_id'], 'timeperiods' => ['st.timeperiod_id']]; protected $groupBase = [
'contacts' => ['co.object_id', 'c.contact_id'],
'timeperiods' => ['ht.timeperiod_id', 'st.timeperiod_id']
];
protected $groupOrigin = ['contactgroups', 'hosts', 'services']; protected $groupOrigin = ['contactgroups', 'hosts', 'services'];