Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Follow up: Fixed issue #1709 - Use 'samaccountname' as login default.

Browse source
This commit is contained in:
Thorsten Eckel 2018-01-17 19:26:15 +01:00
parent a316df0829
commit 33c09ee2e5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/controllers/_integration/ldap.coffee
View file

@ -418,7 +418,7 @@ class ConnectionWizard extends App.WizardModal
if !_.isArray(user_attributes[key]) if !_.isArray(user_attributes[key])
user_attributes[key] = [user_attributes[key]] user_attributes[key] = [user_attributes[key]]
user_attributes_local = user_attributes_local =
"#{@wizardConfig['user_uid']}": 'login' 'samaccountname': 'login'
length = user_attributes.source.length-1 length = user_attributes.source.length-1
for count in [0..length] for count in [0..length]
if user_attributes.source[count] && user_attributes.dest[count] if user_attributes.source[count] && user_attributes.dest[count]
@ -449,7 +449,7 @@ class ConnectionWizard extends App.WizardModal
buildRowsUserMap: (user_attribute_map) => buildRowsUserMap: (user_attribute_map) =>
# show static login row # show static login row
userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes[ @wizardConfig['user_uid'] ] userUidDisplayValue = @wizardConfig.wizardData.backend_user_attributes['samaccountname']
el = [ el = [
$(App.view('integration/ldap_user_attribute_row_read_only')( $(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 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) continue if !(source of @wizardConfig.wizardData.backend_user_attributes)
el.push @buildRowUserAttribute(source, dest) el.push @buildRowUserAttribute(source, dest)
el el