[MRM-1581] rewrite network configuration page.

add validation.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1298563 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
index 339fdbaf9cf3b2b1c72c949a28d5b38f6b32be03..c0619a6010b4cec48060e5c27034182d11167765 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
@@ -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);
+            }
+          });
         }
     });
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 08ec9fd9ba9a0cf00b1cc8dced002c5eacfb2c61..eee85a1323a79f4f4df268af4b95a12667d1f618 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -285,8 +285,8 @@ displayRestError=function(data,idToAppend){
  * @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);