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

Revert "Revert "FilterEditor::handleRequest(): don't apply a filter's changes if the 'Apply' button hasn't been pressed"" 

This reverts commit 45a6259b4c.
This commit is contained in:
Alexander A. Klimov 2016-04-27 12:46:48 +02:00
parent 45a6259b4c
commit 281e6e8163
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,11 +323,12 @@ class FilterEditor extends AbstractWidget
if ($request->get('cancel') === 'Cancel') {
$this->redirectNow($this->preservedUrl()->without('modifyFilter'));
}
$filter = $this->applyChanges($request->getPost());
$url = $this->url()->setQueryString($filter->toQueryString())->addParams($preserve);
$url->getParams()->add('modifyFilter');
$this->redirectNow($url);
if ($request->get('apply') === 'Apply') {
$filter = $this->applyChanges($request->getPost());
$url = $this->url()->setQueryString($filter->toQueryString())->addParams($preserve);
$url->getParams()->add('modifyFilter');
$this->redirectNow($url);
}
}
$this->url()->getParams()->add('modifyFilter');
}