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

Fix no-op searches 

Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
This commit is contained in:
Eric Lippmann 2015-06-01 14:01:40 +02:00
parent 6661d49bd2
commit 44968266f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ class FilterEditor extends AbstractWidget
foreach ($this->searchColumns as $searchColumn) { foreach ($this->searchColumns as $searchColumn) {
$filters[] = Filter::expression($searchColumn, '=', "*$search*"); $filters[] = Filter::expression($searchColumn, '=', "*$search*");
} }
$filter->andFilter(new FilterOr($filters)); $filter = $filter->andFilter(new FilterOr($filters));
} else { } else {
Notification::error(mt('monitoring', 'Cannot search here')); Notification::error(mt('monitoring', 'Cannot search here'));
return $this; return $this;