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

NotificationQuery: Select placeholder values when joining hosts, again 

I've missed that our notification list-view detects based on a attribute's
value of which type a returned row is...

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-10 17:04:00 +02:00
parent 5ad93d138c
commit b235bb6982
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use Zend_Db_Expr;
use Zend_Db_Select;
use Icinga\Data\Filter\Filter;
@ -96,8 +97,11 @@ class NotificationQuery extends IdoQuery
protected function joinHosts()
{
$columns = array_keys(
$this->columnMap['notifications'] + $this->columnMap['hosts'] + $this->columnMap['services']
$this->columnMap['notifications'] + $this->columnMap['hosts']
);
foreach ($this->columnMap['services'] as $column => $_) {
$columns[$column] = new Zend_Db_Expr('NULL');
}
if ($this->fetchHistoryColumns) {
$columns = array_merge($columns, array_keys($this->columnMap['history']));
}