From 1414f3c7e48c9e75be71cd44dfd9b2a06f55155c Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 5 May 2017 15:06:32 +0200 Subject: [PATCH] Working on issue #981 - Allow customization of detected BaseDNs. --- .../javascripts/app/controllers/_integration/ldap.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_integration/ldap.coffee b/app/assets/javascripts/app/controllers/_integration/ldap.coffee index 6ad15ea1c..e10f2d03b 100644 --- a/app/assets/javascripts/app/controllers/_integration/ldap.coffee +++ b/app/assets/javascripts/app/controllers/_integration/ldap.coffee @@ -286,7 +286,7 @@ class ConnectionWizard extends App.WizardModal bindShow: (alreadyShown) => @showSlide('js-bind') if !alreadyShown - @$('.js-bind .js-baseDn').html(@createSelection('base_dn', @wizardConfig.options, @wizardConfig.option)) + @$('.js-bind .js-baseDn').html(@createSelection('base_dn', @wizardConfig.options, @wizardConfig.base_dn || @wizardConfig.option, true)) @$('.js-bind input[name="bind_user"]').val(@wizardConfig.bind_user) @$('.js-bind input[name="bind_pw"]').val(@wizardConfig.bind_pw) @@ -433,7 +433,7 @@ class ConnectionWizard extends App.WizardModal el.find('.js-roleList').html(@createSelection('dest', @wizardConfig.wizardData.roles, dest)) el - createSelection: (name, options, selected) -> + createSelection: (name, options, selected, unknown) -> return App.UiElement.searchable_select.render( name: name multiple: false @@ -442,6 +442,7 @@ class ConnectionWizard extends App.WizardModal nulloption: false options: options value: selected + unknown: unknown class: 'form-control--small' )