Merge branch 'master' into bugfix/separate-configuration-files-for-na…

…vigation-items-10246
Icinga · Sep 30, 2015 · 8b0c820 · 8b0c820
2 parents 915b559 + 64783fd
commit 8b0c820
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
@@ -138,6 +138,14 @@ public function createElements(array $formData)
                 'description'       => $this->translate('The password to use for authentication')
             )
         );
+        $this->addElement(
+            'text',
+            'charset',
+            array (
+                'description'   => $this->translate('The character set for the database'),
+                'label'         => $this->translate('Character Set')
+            )
+        );
         $this->addElement(
             'checkbox',
             'persistent',

diff --git a/modules/setup/application/views/scripts/index/parts/finish.phtml b/modules/setup/application/views/scripts/index/parts/finish.phtml
@@ -8,7 +8,7 @@
   <?php if ($success): ?>
     <?= $this->qlink(
         $this->translate('Login to Icinga Web 2'),
-        'authentication/login',
+        'authentication/login?renderLayout',
         null,
         array(
             'class' => 'button-like login',
@@ -30,4 +30,4 @@
   <pre class="log-output"><?= join("\n\n", array_map(function($a) {
     return join("\n", $a);
   }, $report)); ?></pre>
-</div>
+</div>