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

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2018-04-25 14:24:34 +02:00
commit 3779ccc919
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -294,7 +294,7 @@ class ConnectionWizard extends App.WizardModal
option = '' option = ''
options = {} options = {}
if !_.isEmpty data.attributes if !_.isEmpty data.attributes && !_.isEmpty data.attributes.namingcontexts
for dn in data.attributes.namingcontexts for dn in data.attributes.namingcontexts
options[dn] = dn options[dn] = dn
if option is '' if option is ''