monitoring/list: do not apply empty filter

Fixes problems with the servicematrix when no filter is applied.
I'm not yet happy with this, calls to where() should automagically
handle existing empty filters.

fixes #6543
This commit is contained in:
Thomas Gelf 2014-07-08 16:36:05 +02:00
parent 9a6821c860
commit 2b05aa9504
1 changed files with 3 additions and 1 deletions

View File

@ -524,7 +524,9 @@ class Monitoring_ListController extends Controller
'query' => $query 'query' => $query
)); ));
} }
$query->applyFilter($filter); if (! $filter->isEmpty()) {
$query->applyFilter($filter);
}
$this->view->filter = $filter; $this->view->filter = $filter;
if ($sort) { if ($sort) {
$query->order($sort, $dir); $query->order($sort, $dir);