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

Merge pull request #3091 from Icinga/fix/disable-stacktraces 

Fix that disabled stack straces via user prefs had no effect
This commit is contained in:
lippserd 2017-11-16 20:23:18 +01:00 committed by GitHub
parent 5c1d67a1ec af64ca8fc8
commit 3d50729847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/Icinga/Application/Web.php
View File

@ -423,6 +423,21 @@ class Web extends EmbeddedWeb
$user = $auth->getUser();
$this->getRequest()->setUser($user);
$this->user = $user;
if ($user->can('application/stacktraces')) {
$displayExceptions = $this->user->getPreferences()->getValue(
'icingaweb',
'show_stacktraces'
);
if ($displayExceptions !== null) {
$this->frontController->setParams(
array(
'displayExceptions' => $displayExceptions
)
);
}
}
}
return $this;
}
@ -462,13 +477,6 @@ class Web extends EmbeddedWeb
$this->frontController->setControllerDirectory($this->getApplicationDir('/controllers'));
$displayExceptions = $this->config->get('global', 'show_stacktraces', true);
if ($this->user !== null && $this->user->can('application/stacktraces')) {
$displayExceptions = $this->user->getPreferences()->getValue(
'icingaweb',
'show_stacktraces',
$displayExceptions
);
}
$this->frontController->setParams(
array(