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

2018-04-25 14:24:34 +02:00 · 2018-04-25 14:24:34 +02:00 · 3779ccc919
commit 3779ccc919
parent 11639e2d33 856666db63
1 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee
+++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee
@ -294,7 +294,7 @@ class ConnectionWizard extends App.WizardModal

        option = ''
        options = {}
-        if !_.isEmpty data.attributes
+        if !_.isEmpty data.attributes && !_.isEmpty data.attributes.namingcontexts
          for dn in data.attributes.namingcontexts
            options[dn] = dn
            if option is ''