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

[olamy]

Author: olamy
Date: Sat Dec 29 23:58:47 2012
New Revision: 1426861

URL: http://svn.apache.org/viewvc?rev=1426861&view=rev
Log:
fix validator

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

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=1426861&r1=1426860&r2=1426861&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
 Sat Dec 29 23:58:47 2012
@@ -529,11 +529,13 @@ define("archiva.general-admin",["jquery"
 
     save=function(){
       var userMessages=$("#user-messages");
-      userMessages.html(mediumSpinnerImg());
+
       var mainContent=$("#main-content");
+
       if (!mainContent.find("#network-configuration-edit-form").valid()){
         return;
       }
+      userMessages.html(mediumSpinnerImg());
       mainContent.find("#network-configuration-btn-save" ).button('loading');
       
$.ajax("restServices/archivaServices/archivaAdministrationService/setNetworkConfiguration",
 {
         type: "POST",
@@ -565,11 +567,12 @@ define("archiva.general-admin",["jquery"
           var networkConfiguration=new 
NetworkConfiguration(data.maxTotal,data.maxTotalPerHost,data.usePooling);
           var networkConfigurationViewModel=new 
NetworkConfigurationViewModel(networkConfiguration);
           ko.applyBindings(networkConfigurationViewModel,mainContent.get(0));
-          var validator = 
mainContent.find("#network-configuration-edit-form").validate({
-            showErrors: function(validator, errorMap, errorList) {
-             
customShowError(mainContent.find("#network-configuration-edit-form" 
).get(0),validator,errorMap,errorMap);
-            }
-          });
+          var validator = mainContent.find("#network-configuration-edit-form")
+                  .validate({
+                              showErrors: function(validator, errorMap, 
errorList) {
+                                
customShowError(mainContent.find("#network-configuration-edit-form" 
),validator,errorMap,errorMap);
+                              }
+                            });
         }
     });