svn commit: r1425374 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/general-admin.js templates/archiva/general-admin.html

[olamy]

Author: olamy
Date: Sat Dec 22 23:44:25 2012
New Revision: 1425374

URL: http://svn.apache.org/viewvc?rev=1425374&view=rev
Log:
fix attributes names

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html

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=1425374&r1=1425373&r2=1425374&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
 Sat Dec 22 23:44:25 2012
@@ -1160,7 +1160,7 @@ define("archiva.general-admin",["jquery"
 
 
   
RedbackRuntimeConfiguration=function(userManagerImpls,ldapConfiguration,migratedFromRedbackConfiguration,configurationPropertiesEntries
-                                      
,useUsersCache,usersCacheTimeToIdleSeconds,usersCacheTimeToLiveSeconds){
+                                      ,useUsersCache,cacheConfiguration){
     $.log("new RedbackRuntimeConfiguration");
     var self=this;
     this.modified=ko.observable(false);
@@ -1197,11 +1197,9 @@ define("archiva.general-admin",["jquery"
     this.useUsersCache=ko.observable(useUsersCache);
     this.useUsersCache.subscribe(function(newValue){self.modified(true)});
 
-    
this.usersCacheTimeToIdleSeconds=ko.observable(usersCacheTimeToIdleSeconds);
-    
this.usersCacheTimeToIdleSeconds.subscribe(function(newValue){self.modified(true)});
+    this.usersCacheConfiguration=ko.observable(cacheConfiguration);
+    
this.usersCacheConfiguration.subscribe(function(newValue){self.modified(true)});
 
-    
this.usersCacheTimeToLiveSeconds=ko.observable(usersCacheTimeToLiveSeconds);
-    
this.usersCacheTimeToLiveSeconds.subscribe(function(newValue){self.modified(true)});
 
   }
 
@@ -1212,7 +1210,7 @@ define("archiva.general-admin",["jquery"
 
     var redbackRuntimeConfiguration =
             new 
RedbackRuntimeConfiguration(data.userManagerImpls,ldapConfiguration,data.migratedFromRedbackConfiguration,[]
-                    
,data.useUsersCache,data.usersCacheTimeToIdleSeconds,data.usersCacheTimeToLiveSeconds);
+                    
,data.useUsersCache,mapCacheConfiguration(data.usersCacheConfiguration));
 
     $.log("mapRedbackRuntimeConfiguration done");
     var configurationPropertiesEntries = data.configurationPropertiesEntries 
== null ? []: $.each(data.configurationPropertiesEntries,function(item){
@@ -1499,6 +1497,23 @@ define("archiva.general-admin",["jquery"
 
   }
 
+  CacheConfiguration=function(timeToIdleSeconds,timeToLiveSeconds){
+    var self=this;
+    this.modified=ko.observable(false);
+
+    this.timeToIdleSeconds=ko.observable(timeToIdleSeconds);
+    this.timeToIdleSeconds.subscribe(function(newValue){self.modified(true)});
+
+    this.timeToLiveSeconds=ko.observable(timeToLiveSeconds);
+    this.timeToLiveSeconds.subscribe(function(newValue){self.modified(true)});
 
+  }
+
+  mapCacheConfiguration=function(data){
+    if(!data){
+      return new CacheConfiguration();
+    }
+    return new 
CacheConfiguration(data.timeToIdleSeconds,data.timeToLiveSeconds);
+  }
 
 });
\ No newline at end of file

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1425374&r1=1425373&r2=1425374&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
 Sat Dec 22 23:44:25 2012
@@ -1040,7 +1040,7 @@
             <div class="control-group">
               <label class="control-label" 
for="usersCacheTimeToLiveSeconds">${$.i18n.prop('redback.runtime.usersCacheTimeToLiveSeconds.label')}</label>
               <div class="controls">
-                <input type="text" class="xlarge required numeric" 
data-bind="value: redbackRuntimeConfiguration().usersCacheTimeToLiveSeconds"
+                <input type="text" class="xlarge required numeric" 
data-bind="value: 
redbackRuntimeConfiguration().usersCacheConfiguration().timeToLiveSeconds"
                        id="usersCacheTimeToLiveSeconds" 
name="usersCacheTimeToLiveSeconds" />
               </div>
             </div>
@@ -1048,7 +1048,7 @@
             <div class="control-group">
               <label class="control-label" 
for="usersCacheTimeToIdleSeconds">${$.i18n.prop('redback.runtime.usersCacheTimeToIdleSeconds.label')}</label>
               <div class="controls">
-                <input type="text" class="xlarge required numeric" 
data-bind="value: redbackRuntimeConfiguration().usersCacheTimeToIdleSeconds"
+                <input type="text" class="xlarge required numeric" 
data-bind="value: 
redbackRuntimeConfiguration().usersCacheConfiguration().timeToIdleSeconds"
                        id="usersCacheTimeToIdleSeconds" 
name="usersCacheTimeToIdleSeconds" />
               </div>
             </div>