You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/27 18:04:55 UTC
svn commit: r1236767 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main:
java/org/apache/archiva/webapp/ui/services/api/ webapp/js/archiva/
webapp/js/archiva/templates/
Author: olamy
Date: Fri Jan 27 17:04:54 2012
New Revision: 1236767
URL: http://svn.apache.org/viewvc?rev=1236767&view=rev
Log:
add a rest method to validate id not already exists for networkProxies.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java?rev=1236767&r1=1236766&r2=1236767&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java Fri Jan 27 17:04:54 2012
@@ -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;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java?rev=1236767&r1=1236766&r2=1236767&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java Fri Jan 27 17:04:54 2012
@@ -20,6 +20,7 @@ package org.apache.archiva.webapp.ui.ser
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() );
+ }
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1236767&r1=1236766&r2=1236767&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Fri Jan 27 17:04:54 2012
@@ -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(){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1236767&r1=1236766&r2=1236767&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html Fri Jan 27 17:04:54 2012
@@ -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>