tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

LdapUserGroupBackendForm: Do not disable base_dn' and user_base_dn'

Browse Source 
refs #7343
This commit is contained in:
Johannes Meyer 2015-06-05 16:16:35 +02:00
parent 797e9de629
commit e910a5a254
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
View File

@ -76,6 +76,7 @@ class LdapUserGroupBackendForm extends Form
$groupConfigDisabled = $userConfigDisabled = true; $groupConfigDisabled = $userConfigDisabled = true;
} }
$dnDisabled = null; // MUST BE null
if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') { if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
$userBackend = UserBackend::create($formData['user_backend']); $userBackend = UserBackend::create($formData['user_backend']);
$defaults->merge(array( $defaults->merge(array(
@ -84,11 +85,11 @@ class LdapUserGroupBackendForm extends Form
'user_name_attribute' => $userBackend->getUserNameAttribute(), 'user_name_attribute' => $userBackend->getUserNameAttribute(),
'user_filter' => $userBackend->getFilter() 'user_filter' => $userBackend->getFilter()
)); ));
$userConfigDisabled = true; $userConfigDisabled = $dnDisabled = true;
} }
$this->createGroupConfigElements($defaults, $groupConfigDisabled); $this->createGroupConfigElements($defaults, $groupConfigDisabled);
$this->createUserConfigElements($defaults, $userConfigDisabled); $this->createUserConfigElements($defaults, $userConfigDisabled, $dnDisabled);
} }
/** /**
@ -161,7 +162,6 @@ class LdapUserGroupBackendForm extends Form
'base_dn', 'base_dn',
array( array(
'preserveDefault' => true, 'preserveDefault' => true,
'disabled' => $disabled,
'label' => $this->translate('LDAP Group Base DN'), 'label' => $this->translate('LDAP Group Base DN'),
'description' => $this->translate( 'description' => $this->translate(
'The path where groups can be found on the LDAP server. Leave ' . 'The path where groups can be found on the LDAP server. Leave ' .
@ -177,8 +177,9 @@ class LdapUserGroupBackendForm extends Form
* *
* @param ConfigObject $defaults * @param ConfigObject $defaults
* @param null|bool $disabled * @param null|bool $disabled
* @param null|bool $dnDisabled
*/ */
protected function createUserConfigElements(ConfigObject $defaults, $disabled) protected function createUserConfigElements(ConfigObject $defaults, $disabled, $dnDisabled)
{ {
$this->addElement( $this->addElement(
'text', 'text',
@ -242,7 +243,7 @@ class LdapUserGroupBackendForm extends Form
'user_base_dn', 'user_base_dn',
array( array(
'preserveDefault' => true, 'preserveDefault' => true,
'disabled' => $disabled, 'disabled' => $dnDisabled,
'label' => $this->translate('LDAP User Base DN'), 'label' => $this->translate('LDAP User Base DN'),
'description' => $this->translate( 'description' => $this->translate(
'The path where users can be found on the LDAP server. Leave ' . 'The path where users can be found on the LDAP server. Leave ' .