You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/11 18:13:22 UTC
svn commit: r1444881 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js:
archiva/general-admin.js templates/archiva/general-admin.html
Author: olamy
Date: Mon Feb 11 17:13:22 2013
New Revision: 1444881
URL: http://svn.apache.org/r1444881
Log:
save groups baseDn via the ui
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1444881&r1=1444880&r2=1444881&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js Mon Feb 11 17:13:22 2013
@@ -1289,7 +1289,7 @@ define("archiva.general-admin",["jquery"
}
- 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"
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"
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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1444881&r1=1444880&r2=1444881&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html Mon Feb 11 17:13:22 2013
@@ -1034,6 +1034,16 @@
</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')}
</label>