save groups baseDn via the ui

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1444881 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
index c5c58a9796fb6053f260412389c7b448ea652655..b327ce22dd0dedc1773545d48b7089de4fbb92f1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
@@ -1289,7 +1289,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
 
   }
 
-  LdapConfiguration=function(hostName,port,ssl,baseDn,contextFactory,bindDn,password,authenticationMethod,
+  LdapConfiguration=function(hostName,port,ssl,baseDn,baseGroupsDn,contextFactory,bindDn,password,authenticationMethod,
                              extraPropertiesEntries){
 
     var self=this;
@@ -1311,6 +1311,10 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
     this.baseDn=ko.observable(baseDn);
     this.baseDn.subscribe(function(newValue){self.modified(true)});
 
+    //private String baseGroupsDn;
+    this.baseGroupsDn=ko.observable(baseGroupsDn);
+    this.baseGroupsDn.subscribe(function(newValue){self.modified(true)});
+
     //private String contextFactory;
     this.contextFactory=ko.observable(contextFactory);
     this.contextFactory.subscribe(function(newValue){self.modified(true)});
@@ -1341,7 +1345,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout"
             extraPropertiesEntries=[];
         }
         $.log("mapLdapConfiguration done");
-        return new LdapConfiguration(data.hostName,data.port,data.ssl,data.baseDn,data.contextFactory,data.bindDn,data.password,
+        return new LdapConfiguration(data.hostName,data.port,data.ssl,data.baseDn,data.baseGroupsDn,data.contextFactory,data.bindDn,data.password,
                                     data.authenticationMethod,extraPropertiesEntries);
       }
       return null;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
index d21002a198bcd8ab0b64aeb81c24fdfee0c29e88..ade1b20d9dd9112b9fab60c5685d219a44f32779 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
@@ -1033,6 +1033,16 @@
                        data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().baseDn"/>
               </div>
             </div>
+            <div class="control-group">
+              <label for="baseGroupsDn" class="control-label">
+                ${$.i18n.prop('redback.runtime.ldap.baseGroupsDn.label')}
+              </label>
+              <div class="controls">
+                <input type="text" id="baseGroupsDn" name="baseGroupsDn" class="input-xxlarge"
+                       data-bind="value: redbackRuntimeConfiguration().ldapConfiguration().baseGroupsDn"/>
+              </div>
+            </div>
+
             <div class="control-group">
               <label for="ldapBindDn" class="control-label">
                 ${$.i18n.prop('redback.runtime.ldap.bindDn.label')}