Add some redundancy to get more implicitness

Although this commit does not seem reasonable at first the "big" picture proves its necessity! refs #7163
Icinga · Sep 29, 2014 · 380ffe4 · 380ffe4
1 parent 4f688fa
commit 380ffe4
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 9 deletions.
diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php
@@ -29,6 +29,15 @@ public function init()
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
         $this->addElement(
             'select',
             'db',

diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php
@@ -25,6 +25,15 @@ public function init()
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
         $this->addElement(
             'text',
             'filename',

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
@@ -29,6 +29,15 @@ public function init()
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
         $this->addElement(
             'text',
             'hostname',

diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php
@@ -29,6 +29,15 @@ public function init()
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
         $this->addElement(
             'text',
             'socket',

diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php
@@ -26,6 +26,15 @@ public function init()
      */
     public function createElements(array $formData)
     {
+        $this->addElement(
+            'text',
+            'name',
+            array(
+                'required'      => true,
+                'label'         => t('Resource Name'),
+                'description'   => t('The unique name of this resource')
+            )
+        );
         $this->addElement(
             'text',
             'status_file',

diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php
@@ -224,15 +224,6 @@ public function createElements(array $formData)
             $resourceTypes['db'] = t('SQL Database');
         }
 
-        $this->addElement(
-            'text',
-            'name',
-            array(
-                'required'      => true,
-                'label'         => t('Resource Name'),
-                'description'   => t('The unique name of this resource')
-            )
-        );
         $this->addElement(
             'select',
             'type',