diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2007-08-20 06:38:54 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2007-08-20 06:38:54 +0000 |
| commit | d011dad404aae2772955973825015ad7726c3a07 (patch) | |
| tree | 69a32b3c33931be61f2b0181a024481de970cee1 | |
| parent | bb21670396ecc828cfd6ec8e0ffb81ec8b9bf9a7 (diff) | |
| download | archiva-d011dad404aae2772955973825015ad7726c3a07.tar.gz archiva-d011dad404aae2772955973825015ad7726c3a07.zip | |
[MRM-393]
- Updated javascript function setAndSubmit(..)
- Changed getBlackListPattern() to getPattern in ConfigureProxyConnectorAction.removeBlackListPattern()
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@567556 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 17 insertions, 18 deletions
diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java index 7d9a3e78a..e948f314a 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java @@ -219,7 +219,7 @@ public class ConfigureProxyConnectorAction if ( StringUtils.isBlank( pattern ) ) { - addActionError( "Cannot add an blank white list pattern." ); + addActionError( "Cannot add a blank white list pattern." ); } if ( !hasActionErrors() ) @@ -237,7 +237,7 @@ public class ConfigureProxyConnectorAction if ( StringUtils.isBlank( pattern ) ) { - addActionError( "Cannot remove an blank white list pattern." ); + addActionError( "Cannot remove a blank white list pattern." ); } if ( !hasActionErrors() ) @@ -255,7 +255,7 @@ public class ConfigureProxyConnectorAction if ( StringUtils.isBlank( pattern ) ) { - addActionError( "Cannot add an blank black list pattern." ); + addActionError( "Cannot add a blank black list pattern." ); } if ( !hasActionErrors() ) @@ -269,11 +269,11 @@ public class ConfigureProxyConnectorAction public String removeBlackListPattern() { - String pattern = getBlackListPattern(); + String pattern = getPattern(); if ( StringUtils.isBlank( pattern ) ) { - addActionError( "Cannot remove an blank black list pattern." ); + addActionError( "Cannot remove a blank black list pattern." ); } if ( !hasActionErrors() ) diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp index 28ca95dfa..214736257 100644 --- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp +++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp @@ -36,18 +36,6 @@ <head> <title>Admin : ${addedit} Proxy Connector</title> <ww:head/> - <script type="text/javascript"> - <!-- - function setAndSubmit(id, value, action) - { - var f = document.forms.saveProxyConnector; - - f.action = action; - f[id].value = value; - f.submit(); - } - //--> - </script> </head> <body> @@ -59,7 +47,7 @@ <ww:actionerror/> <ww:actionmessage/> - <ww:form method="post" action="saveProxyConnector" namespace="/admin"> + <ww:form name="saveProxyConnector" method="post" action="saveProxyConnector" namespace="/admin"> <ww:hidden name="mode"/> <input type="hidden" name="pattern"/> @@ -234,7 +222,18 @@ </ww:form> <script type="text/javascript"> + <!-- document.getElementById("saveProxyConnector_proxyId").focus(); + + function setAndSubmit(id, value, action) + { + var f = document.forms['saveProxyConnector']; + + f.action = action; + f.elements[id].value = value; + f.submit(); + } + //--> </script> </div> |