Resource config forms: centralize name element

refs #3035
This commit is contained in:
Alexander A. Klimov 2017-10-27 14:03:26 +02:00
parent 0e5829a9d4
commit 0085da43ee
8 changed files with 30 additions and 46 deletions

View File

@ -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',

View File

@ -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',

View File

@ -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',

View File

@ -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',

View File

@ -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',

View File

@ -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());

View File

@ -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');

View File

@ -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');