From 0085da43eeb50237a93e5b817a243bf9383aa5cf Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 27 Oct 2017 14:03:26 +0200 Subject: [PATCH] Resource config forms: centralize name element refs #3035 --- application/forms/Config/Resource/DbResourceForm.php | 9 --------- application/forms/Config/Resource/FileResourceForm.php | 9 --------- application/forms/Config/Resource/LdapResourceForm.php | 9 --------- .../forms/Config/Resource/RestApiResourceForm.php | 10 ---------- application/forms/Config/Resource/SshResourceForm.php | 9 --------- application/forms/Config/ResourceConfigForm.php | 10 ++++++++++ modules/setup/application/forms/DbResourcePage.php | 10 ++++++++++ modules/setup/application/forms/LdapResourcePage.php | 10 ++++++++++ 8 files changed, 30 insertions(+), 46 deletions(-) diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php index 89fe75f15..05371d686 100644 --- a/application/forms/Config/Resource/DbResourceForm.php +++ b/application/forms/Config/Resource/DbResourceForm.php @@ -73,15 +73,6 @@ class DbResourceForm extends Form ); } - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => $this->translate('Resource Name'), - 'description' => $this->translate('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 index b98f1b410..e452e9447 100644 --- a/application/forms/Config/Resource/FileResourceForm.php +++ b/application/forms/Config/Resource/FileResourceForm.php @@ -24,15 +24,6 @@ class FileResourceForm extends Form */ public function createElements(array $formData) { - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => $this->translate('Resource Name'), - 'description' => $this->translate('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 index 305875f6d..2e3d134bb 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -29,15 +29,6 @@ class LdapResourceForm extends Form ? 389 : 636; - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => $this->translate('Resource Name'), - 'description' => $this->translate('The unique name of this resource') - ) - ); $this->addElement( 'text', 'hostname', diff --git a/application/forms/Config/Resource/RestApiResourceForm.php b/application/forms/Config/Resource/RestApiResourceForm.php index 412254ae7..dd0b5defa 100644 --- a/application/forms/Config/Resource/RestApiResourceForm.php +++ b/application/forms/Config/Resource/RestApiResourceForm.php @@ -55,16 +55,6 @@ class RestApiResourceForm extends Form public function createElements(array $formData) { - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => $this->translate('Resource Name'), - 'description' => $this->translate('The unique name of this resource') - ) - ); - $this->addElement( 'text', 'baseurl', diff --git a/application/forms/Config/Resource/SshResourceForm.php b/application/forms/Config/Resource/SshResourceForm.php index 0d635665c..2e0dff6dd 100644 --- a/application/forms/Config/Resource/SshResourceForm.php +++ b/application/forms/Config/Resource/SshResourceForm.php @@ -28,15 +28,6 @@ class SshResourceForm extends Form */ public function createElements(array $formData) { - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => $this->translate('Resource Name'), - 'description' => $this->translate('The unique name of this resource') - ) - ); $this->addElement( 'text', 'user', diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index f9ed8402f..7383e9ad9 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -287,6 +287,16 @@ class ResourceConfigForm extends ConfigForm ) ); + $this->addElement( + 'text', + 'name', + array( + 'required' => true, + 'label' => $this->translate('Resource Name'), + 'description' => $this->translate('The unique name of this resource') + ) + ); + if (isset($formData['force_creation']) && $formData['force_creation']) { // In case another error occured and the checkbox was displayed before $this->addElement($this->getForceCreationCheckbox()); diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php index 4696e9c86..59066044e 100644 --- a/modules/setup/application/forms/DbResourcePage.php +++ b/modules/setup/application/forms/DbResourcePage.php @@ -49,6 +49,16 @@ class DbResourcePage extends Form ); } + $this->addElement( + 'text', + 'name', + array( + 'required' => true, + 'label' => $this->translate('Resource Name'), + 'description' => $this->translate('The unique name of this resource') + ) + ); + $resourceForm = new DbResourceForm(); $this->addElements($resourceForm->createElements($formData)->getElements()); $this->getElement('name')->setValue('icingaweb_db'); diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php index 6eb34ca1f..f1851561f 100644 --- a/modules/setup/application/forms/LdapResourcePage.php +++ b/modules/setup/application/forms/LdapResourcePage.php @@ -53,6 +53,16 @@ class LdapResourcePage extends Form ); } + $this->addElement( + 'text', + 'name', + array( + 'required' => true, + 'label' => $this->translate('Resource Name'), + 'description' => $this->translate('The unique name of this resource') + ) + ); + $resourceForm = new LdapResourceForm(); $this->addElements($resourceForm->createElements($formData)->getElements()); $this->getElement('name')->setValue('icingaweb_ldap');