tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LdapUserGroupBackendForm: Do not disable group configuration.. 

..when no user backend has been linked and it's not a ActiveDirectory.

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

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

@ -70,10 +70,10 @@ class LdapUserGroupBackendForm extends Form
$groupBackend = new LdapUserGroupBackend($resource); $groupBackend = new LdapUserGroupBackend($resource);
if ($formData['type'] === 'ldap') { if ($formData['type'] === 'ldap') {
$defaults = $groupBackend->getOpenLdapDefaults(); $defaults = $groupBackend->getOpenLdapDefaults();
$disabled = null; // MUST BE null, do NOT change this to false! $groupConfigDisabled = $userConfigDisabled = null; // MUST BE null, do NOT change this to false!
} else { // $formData['type'] === 'msldap' } else { // $formData['type'] === 'msldap'
$defaults = $groupBackend->getActiveDirectoryDefaults(); $defaults = $groupBackend->getActiveDirectoryDefaults();
$disabled = true; $groupConfigDisabled = $userConfigDisabled = true;
} }
if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') { if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
@ -84,11 +84,11 @@ class LdapUserGroupBackendForm extends Form
'user_name_attribute' => $userBackend->getUserNameAttribute(), 'user_name_attribute' => $userBackend->getUserNameAttribute(),
'user_filter' => $userBackend->getFilter() 'user_filter' => $userBackend->getFilter()
)); ));
$disabled = true; $userConfigDisabled = true;
} }
$this->createGroupConfigElements($defaults, $disabled); $this->createGroupConfigElements($defaults, $groupConfigDisabled);
$this->createUserConfigElements($defaults, $disabled); $this->createUserConfigElements($defaults, $userConfigDisabled);
} }
/** /**