From bfac5bf3a8e7dad54070ab577c66d5a09fe92c66 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 15 Jun 2023 11:13:57 +0200 Subject: [PATCH] Don't parse new filters with the legacy implementation (cherry picked from commit aaff1c3f58340c06bc608fb653ba61bda682f74e) --- library/Graphite/Web/Widget/IcingadbGraphs.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/library/Graphite/Web/Widget/IcingadbGraphs.php b/library/Graphite/Web/Widget/IcingadbGraphs.php index e038e92..a96043e 100644 --- a/library/Graphite/Web/Widget/IcingadbGraphs.php +++ b/library/Graphite/Web/Widget/IcingadbGraphs.php @@ -4,7 +4,6 @@ namespace Icinga\Module\Graphite\Web\Widget; -use Icinga\Data\Filter\Filter; use Icinga\Module\Graphite\Web\Widget\Graphs\Icingadb\IcingadbHost; use Icinga\Module\Graphite\Web\Widget\Graphs\Icingadb\IcingadbService; use Icinga\Module\Icingadb\Common\Links; @@ -71,7 +70,9 @@ class IcingadbGraphs extends BaseHtmlElement $hostUrl = Links::host($hostObj); if ($this->hasBaseFilter()) { - $hostUrl->addFilter(Filter::fromQueryString(QueryString::render($this->getBaseFilter()))); + $hostUrlParams = $hostUrl->getParams()->toArray(false); + $hostUrl->setQueryString(QueryString::render($this->getBaseFilter())) + ->addParams($hostUrlParams); } $hostLink = new Link( @@ -85,7 +86,9 @@ class IcingadbGraphs extends BaseHtmlElement $serviceUrl = Links::service($object, $hostObj); if ($this->hasBaseFilter()) { - $serviceUrl->addFilter(Filter::fromQueryString(QueryString::render($this->getBaseFilter()))); + $serviceUrlParams = $serviceUrl->getParams()->toArray(false); + $serviceUrl->setQueryString(QueryString::render($this->getBaseFilter())) + ->addParams($serviceUrlParams); } $serviceLink = new Link(