Author: olamy
Date: Fri Dec 7 09:27:20 2012
New Revision: 1418231
URL: http://svn.apache.org/viewvc?rev=1418231&view=rev
Log:
add new javascript bean properties
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1418231&r1=1418230&r2=1418231&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Fri Dec 7 09:27:20 2012
@@ -1151,9 +1151,16 @@ define("archiva.general-admin",["jquery"
}
-
ArchivaRuntimeConfiguration=function(userManagerImpl,archivaLdapConfiguration){
+
ArchivaRuntimeConfiguration=function(userManagerImpl,archivaLdapConfiguration,migratedFromRedbackConfiguration,configurationProperties){
this.userManagerImpl=ko.observable(userManagerImpl);
this.archivaLdapConfiguration=ko.observable(archivaLdapConfiguration);
+
this.migratedFromRedbackConfiguration=ko.observable(migratedFromRedbackConfiguration);
+
this.configurationProperties=ko.observableArray(configurationProperties?configurationProperties:[]);
+ }
+
+ mapArchivaRuntimeConfiguration=function(data){
+ return new
ArchivaRuntimeConfiguration(data.userManagerImpl,mapArchivaLdapConfiguration(data.archivaLdapConfiguration,data.migratedFromRedbackConfiguration,
+ data.configurationProperties));
}
ArchivaLdapConfiguration=function(hostName,port,ssl,baseDn,contextFactory,bindDn,password,authenticationMethod,
@@ -1186,6 +1193,14 @@ define("archiva.general-admin",["jquery"
this.extraProperties=ko.observableArray(extraProperties);
}
+ mapArchivaLdapConfiguration=function(data){
+ if(data){
+ return new
ArchivaLdapConfiguration(data.hostName,data.port,data.ssl,data.baseDn,data.contextFactory,data.bindDn,data.password,
+
data.authenticationMethod,data.extraProperties);
+ }
+ return null;
+ }
+
ArchivaRuntimeConfigurationViewModel=function(archivaRuntimeConfiguration,userManagerImplementationInformations){
this.archivaRuntimeConfiguration=ko.observable(archivaRuntimeConfiguration);
this.userManagerImplementationInformations=ko.observable(userManagerImplementationInformations);
@@ -1268,8 +1283,6 @@ define("archiva.general-admin",["jquery"
}
- mapArchivaRuntimeConfiguration=function(data){
- return new ArchivaRuntimeConfiguration(data.userManagerImpl);
- }
+
});
\ No newline at end of file
