From 33c09ee2e5eb58c5261bf6c92c5dca179dad5caa Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Wed, 17 Jan 2018 19:26:15 +0100 Subject: [PATCH] Follow up: Fixed issue #1709 - Use 'samaccountname' as login default. --- .../javascripts/app/controllers/_integration/ldap.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_integration/ldap.coffee b/app/assets/javascripts/app/controllers/_integration/ldap.coffee index 3384980a9..433b80b57 100644 --- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee +++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee @@ -418,7 +418,7 @@ class ConnectionWizard extends App.WizardModal if !_.isArray(user_attributes[key]) user_attributes[key] = [user_attributes[key]] user_attributes_local = - "#{@wizardConfig['user_uid']}": 'login' + 'samaccountname': 'login' length = user_attributes.source.length-1 for count in [0..length] if user_attributes.source[count] && user_attributes.dest[count] @@ -449,7 +449,7 @@ class ConnectionWizard extends App.WizardModal buildRowsUserMap: (user_attribute_map) => # show static login row - userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes[ @wizardConfig['user_uid'] ] + userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes['samaccountname'] el = [ $(App.view('integration/ldap_user_attribute_row_read_only')( @@ -458,7 +458,7 @@ class ConnectionWizard extends App.WizardModal )) ] for source, dest of user_attribute_map - continue if source == @wizardConfig['user_uid'] + continue if source == 'samaccountname' continue if !(source of @wizardConfig.wizardData.backend_user_attributes) el.push @buildRowUserAttribute(source, dest) el