Merge remote-tracking branch 'origin/master'

src/main/webapp/public/resources/js/configeditor-settings.js

@@ -2406,7 +2406,8 @@ UserPermissionHandler.draw = function(keyName) {
 
                 var currentBaseValue = ('ldapBase' in resultValue[rowKey]) ? resultValue[rowKey]['ldapBase'] : "";
                 var baseEditor = function(){
-                    UILibrary.editLdapDN(function(value) {
+                    UILibrary.editLdapDN(function(value, ldapProfileID) {
+                        PWM_VAR['clientSettingCache'][keyName][rowKey]['ldapProfileID'] = ldapProfileID;
                         PWM_VAR['clientSettingCache'][keyName][rowKey]['ldapBase'] = value;
                         UserPermissionHandler.write(keyName,true);
                     });

src/main/webapp/public/resources/js/uilibrary.js

@@ -256,7 +256,12 @@ UILibrary.editLdapDN = function(nextFunction, options) {
             PWM_MAIN.doQuery(".selectableDN",function(element){
                 var dnValue = element.getAttribute("data-dn");
                 PWM_MAIN.addEventHandler(element,'click',function(){
-                    nextFunction(dnValue);
+                    var ldapProfileID = "default";
+                    if (document.getElementById("select-profileList")) {
+                        ldapProfileID = document.getElementById("select-profileList").value;
+                    }
+
+                    nextFunction(dnValue, ldapProfileID);
                     PWM_MAIN.closeWaitDialog();
                 });
             });