upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Controller: Already shift filter params in createFilterControl()

Browse source
This commit is contained in:
Johannes Meyer 2020-05-28 16:10:52 +02:00
parent 8e4eb677bb
commit 98c2e9f7bf
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/Icingadb/Web/Controller.php
View file

@ -146,6 +146,13 @@ class Controller extends CompatController
$filterControl = new FilterControl($query, $preserveParams);
$filterControl->handleRequest($request);
// We're cloning the params, the editor does it, so we have to shift these ourselves
$this->params->shift('addFilter');
$this->params->shift('removeFilter');
$this->params->shift('stripFilter');
$this->params->shift('modifyFilter');
$this->params->shift('q');
return $filterControl;
}

8
library/Icingadb/Widget/FilterControl.php
View file

@ -38,14 +38,6 @@ class FilterControl extends HtmlDocument
public function handleRequest(Request $request)
{
$this->getFilterEditor()->handleRequest($request);
// The editor clones the url prior shifting these so we have to do it again here
$params = $request->getUrl()->getParams();
$params->shift('addFilter');
$params->shift('removeFilter');
$params->shift('stripFilter');
$params->shift('modifyFilter');
$params->shift('q');
}
/**