Merge branch 'feature/config-error'

Icinga · Mar 21, 2018 · 65b0773 · 65b0773
2 parents 759851a + 5438bab
commit 65b0773
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/library/Graphite/Web/Widget/Graphs.php b/library/Graphite/Web/Widget/Graphs.php
@@ -4,6 +4,8 @@
 
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
+use Icinga\Authentication\Auth;
+use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Graphite\Forms\TimeRangePicker\TimeRangePickerTrait;
 use Icinga\Module\Graphite\Graphing\GraphingTrait;
 use Icinga\Module\Graphite\Graphing\Template;
@@ -317,7 +319,22 @@ protected function getGraphsList()
 
     public function render()
     {
-        $result = $this->getGraphsList();
+        try {
+            $result = $this->getGraphsList();
+        } catch (ConfigurationError $e) {
+            $view = $this->view();
+
+            return "<p>{$view->escape($e->getMessage())}</p>"
+                . '<p>' . vsprintf(
+                    $view->escape($view->translate('Please %scorrect%s the configuration of the Graphite module.')),
+                    Auth::getInstance()->hasPermission('config/modules')
+                        ? explode(
+                            '$LINK_TEXT$',
+                            $view->qlink('$LINK_TEXT$', 'graphite/config/backend', null, ['class' => 'action-link'])
+                        )
+                        : ['', '']
+                ) . '</p>';
+        }
 
         if ($result === '' && $this->getShowNoGraphsFound()) {
             $view = $this->view();