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

ActionController: shift global parameters globally

This commit is contained in:
Thomas Gelf 2014-11-23 20:07:30 +01:00
parent 8d8b65473a
commit cddb68bffb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Web/Controller/ActionController.php
View File

@ -73,10 +73,10 @@ class ActionController extends Zend_Controller_Action
$this->handlerBrowserWindows(); $this->handlerBrowserWindows();
$this->view->translationDomain = 'icinga'; $this->view->translationDomain = 'icinga';
$this->_helper->layout()->isIframe = $this->params->shift('isIframe'); $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
$this->_helper->layout()->moduleName = false; $this->_helper->layout()->moduleName = false;
if ($this->rerenderLayout = $this->params->shift('renderLayout')) { if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
$this->xhrLayout = 'body'; $this->xhrLayout = 'body';
} }

4
modules/monitoring/application/controllers/ListController.php
View File

@ -639,8 +639,8 @@ class Monitoring_ListController extends Controller
{ {
$editor = Widget::create('filterEditor') $editor = Widget::create('filterEditor')
->setQuery($query) ->setQuery($query)
->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend', 'renderLayout', 'stateType', 'addColumns') ->preserveParams('limit', 'sort', 'dir', 'format', 'view', 'backend', 'stateType', 'addColumns')
->ignoreParams('page', 'objecttype', 'from', 'to', 'btn_submit', 'icon') ->ignoreParams('page')
->handleRequest($this->getRequest()); ->handleRequest($this->getRequest());
$query->applyFilter($editor->getFilter()); $query->applyFilter($editor->getFilter());