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/02/10 18:25:04 UTC
svn commit: r1242866 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
Author: olamy
Date: Fri Feb 10 17:25:04 2012
New Revision: 1242866
URL: http://svn.apache.org/viewvc?rev=1242866&view=rev
Log:
[MRM-1576] rewrite proxies connector page
add confirm dialog for proxy connector delete.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
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/proxy-connectors.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1242866&r1=1242865&r2=1242866&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Fri Feb 10 17:25:04 2012
@@ -142,4 +142,5 @@ proxyconnector.updated=ProxyConnector up
proxy-connectors.grid.remoterepo.settings.popover.title=Proxy Connector Settings
proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
proxy.connector.bulk.save.confirm=Are you sure to update {0} Proxy Connector(s)
+proxyconnector.delete.confirm=Are you sure to delete the Proxy Connector
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=1242866&r1=1242865&r2=1242866&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 Feb 10 17:25:04 2012
@@ -175,7 +175,8 @@ $(function() {
removeNetworkProxy=function(networkProxy){
openDialogConfirm(
- function(){$.ajax("restServices/archivaServices/networkProxyService/deleteNetworkProxy/"+encodeURIComponent(networkProxy.id()),
+ function(){
+ $.ajax("restServices/archivaServices/networkProxyService/deleteNetworkProxy/"+encodeURIComponent(networkProxy.id()),
{
type: "get",
success: function(data) {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1242866&r1=1242865&r2=1242866&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Fri Feb 10 17:25:04 2012
@@ -311,12 +311,15 @@ $(function() {
mainContent.find("#proxy-connectors-view-tabs-li-edit a").html($.i18n.prop("edit"));
}
deleteProxyConnector=function(proxyConnector){
- clearUserMessages();
- removeProxyConnector(proxyConnector,function(){
- displaySuccessMessage($.i18n.prop('proxyconnector.removed'));
- self.proxyConnectors.remove(proxyConnector);
- //self.displayGrid();
- });
+
+ openDialogConfirm(
+ function(){
+ clearUserMessages();
+ removeProxyConnector(proxyConnector,function(){
+ displaySuccessMessage($.i18n.prop('proxyconnector.removed'));
+ self.proxyConnectors.remove(proxyConnector);
+ closeDialogConfirm();
+ })}, $.i18n.prop('ok'), $.i18n.prop('cancel'), $.i18n.prop('proxyconnector.delete.confirm'),null);
}