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

Dashboard: Fix reading and disabled system dashboards 

refs #4537
This commit is contained in:
Marius Hein 2014-11-19 10:33:41 +01:00
parent cfb0ca1be0
commit a5411c7a1c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/views/scripts/dashboard/settings.phtml
View File

@ -38,6 +38,7 @@
</tr> </tr>
<?php else: ?> <?php else: ?>
<?php foreach ($components as $component): ?> <?php foreach ($components as $component): ?>
<?php if ($component->getDisabled() === true) continue; ?>
<tr> <tr>
<td> <td>
<a href="<?= $this->href('dashboard/update-component', array('pane' => $pane->getName(), 'component' => $component->getTitle())); ?>"> <a href="<?= $this->href('dashboard/update-component', array('pane' => $pane->getName(), 'component' => $component->getTitle())); ?>">

6
library/Icinga/Web/Widget/Dashboard.php
View File

@ -114,7 +114,11 @@ class Dashboard extends AbstractWidget
*/ */
private function loadUserDashboards() private function loadUserDashboards()
{ {
$config = Config::fromIni($this->getConfigFile()); try {
$config = Config::fromIni($this->getConfigFile());
} catch (NotReadableError $e) {
return;
}
if (! count($config)) { if (! count($config)) {
return false; return false;
} }