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

Fix that queryfilters are being ignored by the parser

This commit is contained in:
Johannes Meyer 2014-03-17 16:08:12 +01:00
parent 0227c6a49d
commit e355415164
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Icinga/Data/Db/TreeToSqlParser.php
View File

@ -193,8 +193,7 @@ class TreeToSqlParser
if ($tree->root == null) { if ($tree->root == null) {
return; return;
} }
$tree->root = $tree->normalizeTree($tree->root); $sql = $this->nodeToSqlQuery($tree->normalizeTree($tree->root));
$sql = $this->nodeToSqlQuery($tree->root);
if ($this->filtersAggregate()) { if ($this->filtersAggregate()) {
$baseQuery->having($sql); $baseQuery->having($sql);

10
library/Icinga/Filter/Query/Tree.php
View File

@ -232,12 +232,12 @@ class Tree
$node->left = $this->removeInvalidFilter($node->left, $filter); $node->left = $this->removeInvalidFilter($node->left, $filter);
$node->right = $this->removeInvalidFilter($node->right, $filter); $node->right = $this->removeInvalidFilter($node->right, $filter);
if ($node->left && $node->right) { if ($node->left || $node->right) {
if (!$node->left) {
$node->left = $node->right;
$node->right = null;
}
return $node; return $node;
} elseif ($node->left) {
return $node->left;
} elseif ($node->right) {
return $node->right;
} }
return null; return null;

2
library/Icinga/Web/Widget/FilterBadgeRenderer.php
View File

@ -182,6 +182,6 @@ EOT;
return ''; return '';
} }
$this->buildBaseUrl(); $this->buildBaseUrl();
return $this->nodeToBadge($this->tree->root); return $this->nodeToBadge(Tree::normalizeTree($this->tree->root));
} }
} }