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

Remove deprecated code

This commit is contained in:
Eric Lippmann 2014-02-20 16:11:16 +01:00 committed by Thomas Gelf
parent 9ac77de47c
commit 94a900bb5c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,14 +261,9 @@ class ActionController extends Zend_Controller_Action
Benchmark::measure('Action::postDispatch()'); Benchmark::measure('Action::postDispatch()');
if ($this->_request->isXmlHttpRequest()) { if ($this->_request->isXmlHttpRequest()) {
$target = ($this->getParam('render') === 'detail') ? 'inline' : 'body'; $this->_helper->layout()->setLayout('inline');
if ($target !== 'inline') {
$target = ($this->getParam('view') === 'compact') ? 'inline' : 'body';
}
$target = 'inline';
$this->_helper->layout()->setLayout($target);
} }
if ($user = $this->getRequest()->getUser()) { if ($user = $this->_request->getUser()) {
if ($user->getPreferences()->get('app.showBenchmark') === true) { if ($user->getPreferences()->get('app.showBenchmark') === true) {
Benchmark::measure('Response ready'); Benchmark::measure('Response ready');
$this->_helper->layout()->benchmark = $this->renderBenchmark(); $this->_helper->layout()->benchmark = $this->renderBenchmark();