Author: oching
Date: Sun Aug 19 23:38:54 2007
New Revision: 567556
URL: http://svn.apache.org/viewvc?rev=567556&view=rev
Log:
[MRM-393]
- Updated javascript function setAndSubmit(..)
- Changed getBlackListPattern() to getPattern in
ConfigureProxyConnectorAction.removeBlackListPattern()
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java?rev=567556&r1=567555&r2=567556&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
Sun Aug 19 23:38:54 2007
@@ -219,7 +219,7 @@
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 @@
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 @@
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 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() )
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp?rev=567556&r1=567555&r2=567556&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp
Sun Aug 19 23:38:54 2007
@@ -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>
