Configuration: to not head on to migrations...

...as long as the "Choose DB form" has errors. This avoids duplicate error messages refs #62
Icinga · Dec 7, 2018 · a6a3f35 · a6a3f35
1 parent b9d3438
commit a6a3f35
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/application/controllers/ConfigurationController.php b/application/controllers/ConfigurationController.php
@@ -26,9 +26,15 @@ public function indexAction()
 
             return;
         }
+        $form = ChooseDbResourceForm::load()->handleRequest();
         $this->content()->add(Html::tag('div', [
             'class' => 'icinga-module module-director'
-        ], ChooseDbResourceForm::load()->handleRequest()));
+        ], $form));
+        if ($form->hasErrors()) {
+            $this->addSingleTab($this->translate('Configuration'));
+
+            return;
+        }
 
         if ($this->Config()->get('db', 'resource')) {
             $db = $this->db();
@@ -42,6 +48,8 @@ public function indexAction()
             try {
                 $this->showMigrations($db);
             } catch (Exception $e) {
+                $this->addSingleTab($this->translate('Configuration'));
+
                 $this->content()->add(Html::tag('p', [
                     'class' => 'error',
                 ], $e->getMessage()));