svn commit: r1298563 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: general-admin.js utils.js

[olamy]

Author: olamy
Date: Thu Mar  8 20:30:05 2012
New Revision: 1298563

URL: http://svn.apache.org/viewvc?rev=1298563&view=rev
Log:
[MRM-1581] rewrite network configuration page.
add validation.

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/archiva/utils.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=1298563&r1=1298562&r2=1298563&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
 Thu Mar  8 20:30:05 2012
@@ -520,6 +520,9 @@ $(function() {
     this.networkConfiguration=ko.observable(networkConfiguration);
 
     save=function(){
+      if (!$("#main-content #network-proxy-edit-form").valid()){
+        return;
+      }
       clearUserMessages();
       
$.ajax("restServices/archivaServices/archivaAdministrationService/setNetworkConfiguration",
 {
         type: "POST",
@@ -544,6 +547,11 @@ $(function() {
           var networkConfiguration=new 
NetworkConfiguration(data.maxTotal,data.maxTotalPerHost,data.usePooling);
           var networkConfigurationViewModel=new 
NetworkConfigurationViewModel(networkConfiguration);
           ko.applyBindings(networkConfigurationViewModel,mainContent.get(0));
+          var validator = $("#main-content 
#network-proxy-edit-form").validate({
+            showErrors: function(validator, errorMap, errorList) {
+             customShowError(mainContent.find("#network-proxy-edit-form" 
).get(0),validator,errorMap,errorMap);
+            }
+          });
         }
     });
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1298563&r1=1298562&r2=1298563&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 Thu Mar  8 20:30:05 2012
@@ -285,8 +285,8 @@ displayRestError=function(data,idToAppen
  * @param errorList
  */
 customShowError=function(selector, validator, errorMap, errorList) {
-  $(selector ).find("div.control-group" ).removeClass( "error" );
-  $(selector).find("span.help-inline").remove();
+  $.isFunction(selector)? selector.find("div.control-group" ).removeClass( 
"error" ):$(selector).find("div.control-group" ).removeClass( "error" );
+  $.isFunction(selector)? 
selector.find("span.help-inline").remove():$(selector).find("span.help-inline").remove();
   for ( var i = 0; errorList[i]; i++ ) {
     var error = errorList[i];
     var field = $("#"+error.element.id);