From ac08fb2c3be5f8ada034b6a6bd2c92aeedd9bba3 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 26 Jul 2019 14:35:50 +0200 Subject: [PATCH] Fix filtered links in the tactical overview Filter chains require parantheses to work properly. --- .../application/controllers/TacticalController.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/monitoring/application/controllers/TacticalController.php b/modules/monitoring/application/controllers/TacticalController.php index c60a373bb..6f9ae7fef 100644 --- a/modules/monitoring/application/controllers/TacticalController.php +++ b/modules/monitoring/application/controllers/TacticalController.php @@ -55,11 +55,8 @@ class TacticalController extends Controller $this->setupFilterControl($stats, null, ['host', 'service'], ['format']); $this->view->setHelperFunction('filteredUrl', function ($path, array $params) { $filter = clone $this->view->filterEditor->getFilter(); - foreach ($params as $column => $value) { - $filter = $filter->andFilter($filter->where($column, $value)); - } - return $this->view->url($path)->setQueryString($filter->toQueryString()); + return $this->view->url($path)->setParams($params)->addFilter($filter); }); $this->handleFormatRequest($stats);