add a rest method to validate id not already exists for networkProxies.

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java
index 2d28f6723502f00e6a9eb84cbbe66af9f4b8f5cb..12010ef4728e6379180a741f78bdcb59abeeac37 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java
@@ -47,4 +47,11 @@ public interface DataValidatorService
     @RedbackAuthorization( noRestriction = true )
     Boolean remoteRepositoryIdNotExists( @QueryParam( "id" ) String id )
         throws ArchivaRestServiceException;
+
+    @Path( "networkProxyIdNotExists" )
+    @GET
+    @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+    @RedbackAuthorization( noRestriction = true )
+    Boolean networkProxyIdNotExists( @QueryParam( "id" ) String id )
+        throws ArchivaRestServiceException;
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java
index d901770a974d8bebc43030fd6717e74ffa6b7599..90f5eb07a66607a32ee1c329dd1661bcab9b18e2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java
@@ -20,6 +20,7 @@ package org.apache.archiva.webapp.ui.services.api;
 
 import org.apache.archiva.admin.model.RepositoryAdminException;
 import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
 import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
 import org.springframework.stereotype.Service;
@@ -41,6 +42,9 @@ public class DefaultDataValidatorService
     @Inject
     private RemoteRepositoryAdmin remoteRepositoryAdmin;
 
+    @Inject
+    private NetworkProxyAdmin networkProxyAdmin;
+
 
     public Boolean managedRepositoryIdNotExists( String id )
         throws ArchivaRestServiceException
@@ -67,4 +71,17 @@ public class DefaultDataValidatorService
             throw new ArchivaRestServiceException( e.getMessage() );
         }
     }
+
+    public Boolean networkProxyIdNotExists( String id )
+        throws ArchivaRestServiceException
+    {
+        try
+        {
+            return networkProxyAdmin.getNetworkProxy( id ) == null;
+        }
+        catch ( RepositoryAdminException e )
+        {
+            throw new ArchivaRestServiceException( e.getMessage() );
+        }
+    }
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
index ed48913ed565a8c336c079a045060c3c80c9de64..46cbb03fbfbeafc81c34ca1aa30dd6071acb7fa6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
@@ -108,7 +108,7 @@ $(function() {
 
     editNetworkProxy=function(networkProxy){
       $.log("editNetworkProxy");
-      $("#main-content #network-proxies-edit a").html($.i18n.prop("edit"));
+      $("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("edit"));
       var viewModel = new NetworkProxyViewModel(networkProxy,true,self);
       ko.applyBindings(viewModel,$("#main-content #network-proxies-edit").get(0));
       activateNetworkProxyFormValidation();
@@ -154,7 +154,7 @@ $(function() {
         activateNetworkProxyFormValidation();
       }
       if ($(e.target).attr("href")=="#network-proxies-view") {
-        $("#main-content #network-proxies-edit a").html($.i18n.prop("add"));
+        $("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("add"));
       }
 
     });
@@ -202,11 +202,19 @@ $(function() {
   }
 
   activateNetworkProxyFormValidation=function(){
-    $("#main-content #network-proxy-edit-form").validate({
-               showErrors: function(validator, errorMap, errorList) {
-                 customShowError(validator,errorMap,errorMap);
-               }
-              });
+    var validator = $("#main-content #network-proxy-edit-form").validate({
+      rules: {id: {
+       required: true,
+       remote: {
+         url: "restServices/archivaUiServices/dataValidatorService/networkProxyIdNotExists",
+         type: "get"
+       }
+      }},
+      showErrors: function(validator, errorMap, errorList) {
+       customShowError(validator,errorMap,errorMap);
+      }
+    });
+    validator.settings.messages["id"]=$.i18n.prop("id.required.or.alreadyexists");
   }
 
   activateNetworkProxiesGridTab=function(){

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
index c19d99b7d8312b574d7b395bd83c3fd316ca859e..5d5a1c87a4b4e693223e1c0f7c9c1d7e059c0973 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
@@ -72,7 +72,7 @@
             {{if update}}
               <span class="uneditable-input">${$data.networkProxy.id}</span>
             {{else}}
-              <input type="text" class="xlarge required" id="id" name="id" size="10"
+              <input type="text" class="xlarge" id="id" name="id" size="10"
                      data-bind="value: networkProxy.id,css:{'uneditable-input': update},readonly:update"/>
             {{/if}}
           </div>