[icinga-checkins] icinga.org: icingaweb2/bugfix/update-german-translation-10307: DbResourceForm: move the encryption settings below all others

git at icinga.org git at icinga.org
Mon Dec 12 10:36:30 CET 2016


Module: icingaweb2
Branch: bugfix/update-german-translation-10307
Commit: 2e1c1da927dd718cb301cc5b298006c71c089487
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=2e1c1da927dd718cb301cc5b298006c71c089487

Author: Alexander A. Klimov <alexander.klimov at icinga.com>
Date:   Thu Dec  8 17:11:15 2016 +0100

DbResourceForm: move the encryption settings below all others

refs #11115

---

 .../forms/Config/Resource/DbResourceForm.php       |   38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
index 30a6068..25bf3b3 100644
--- a/application/forms/Config/Resource/DbResourceForm.php
+++ b/application/forms/Config/Resource/DbResourceForm.php
@@ -148,6 +148,25 @@ class DbResourceForm extends Form
                 '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',
+            array(
+                'description'   => $this->translate(
+                    'Check this box for persistent database connections. Persistent connections are not closed at the'
+                    . ' end of a request, but are cached and re-used. This is experimental'
+                ),
+                'label'         => $this->translate('Persistent')
+            )
+        );
         if (! empty($encryptionChoices)) {
             $this->addElement(
                 'select',
@@ -209,25 +228,6 @@ class DbResourceForm extends Form
                 );
             }
         }
-        $this->addElement(
-            'text',
-            'charset',
-            array (
-                'description'   => $this->translate('The character set for the database'),
-                'label'         => $this->translate('Character Set')
-            )
-        );
-        $this->addElement(
-            'checkbox',
-            'persistent',
-            array(
-                'description'   => $this->translate(
-                    'Check this box for persistent database connections. Persistent connections are not closed at the'
-                    . ' end of a request, but are cached and re-used. This is experimental'
-                ),
-                'label'         => $this->translate('Persistent')
-            )
-        );
 
         return $this;
     }



More information about the icinga-checkins mailing list