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

Respect notification type of subqueries

This commit is contained in:
Eric Lippmann 2019-07-15 16:35:27 +02:00 committed by Johannes Meyer
parent 1d1fd0b3b2
commit f80a61d9e5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
View File

@ -27,7 +27,7 @@ class NotificationhistoryQuery extends IdoQuery
'output' => 'n.output',
'state' => 'n.state',
'timestamp' => 'n.timestamp',
'type' => "('notify')"
'type' => 'n.type'
),
'hosts' => array(
'host_display_name' => 'n.host_display_name',
@ -79,9 +79,6 @@ class NotificationhistoryQuery extends IdoQuery
$columns[$column] = new Zend_Db_Expr('NULL');
}
}
if (isset($columns['type'])) {
unset($columns['type']);
}
$hosts = $this->createSubQuery('hostnotification', $columns);
$this->subQueries[] = $hosts;
$this->notificationQuery->union(array($hosts), Zend_Db_Select::SQL_UNION_ALL);
@ -93,9 +90,6 @@ class NotificationhistoryQuery extends IdoQuery
protected function joinServices()
{
$columns = array_flip($this->desiredColumns);
if (isset($columns['type'])) {
unset($columns['type']);
}
$services = $this->createSubQuery('servicenotification', array_flip($columns));
$this->subQueries[] = $services;
$this->notificationQuery->union(array($services), Zend_Db_Select::SQL_UNION_ALL);