From 3372bcc7fcba026b9d2ac58812863e1e74c8ffdf Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 17 May 2019 16:19:23 +0200 Subject: fixes possible override of uniqueMember by autodetection * uniqueMember was the default so we did not know whether this setting is desired or the initial value * autodetection of the user-group association attribute runs only when it was not set (as far as we knew) * the default is now empty * thus LDAPProvider might return this value as well (in exceptional cases) * if a group base is given (edge case), use this instead of general base * resolves #12682 Signed-off-by: Arthur Schiwon --- apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/user_ldap/js') diff --git a/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js b/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js index 953a0b909a6..a20bdd9ac9b 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js +++ b/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js @@ -27,7 +27,7 @@ OCA = OCA || {}; run: function(model, configID) { // TODO: might be better with configuration marker as uniqueMember // is a valid value (although probably less common then member and memberUid). - if(model.configuration.ldap_group_member_assoc_attribute && model.configuration.ldap_group_member_assoc_attribute !== 'uniqueMember') { + if(model.configuration.ldap_group_member_assoc_attribute && model.configuration.ldap_group_member_assoc_attribute !== '') { // a value is already set. Don't overwrite and don't ask LDAP // without reason. return false; -- cgit v1.2.3