]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb21670)
[MRM-393]
authorMaria Odea B. Ching <oching@apache.org>
Mon, 20 Aug 2007 06:38:54 +0000 (06:38 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Mon, 20 Aug 2007 06:38:54 +0000 (06:38 +0000)
- 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

archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java patch | blob | history
archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxyConnector.jsp patch | blob | history

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 7d9a3e78ab9f28b0f4036aa9855e0356d5331d7e..e948f314ae23663ae1c994f6f8b70e58ad859fc2 100644 (file)
--- 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 28ca95dfaf6332d6eb4700b8457c77ce4bd8dbb6..214736257444525b207f8cf6d205c3ef03091ca1 100644 (file)
--- 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>
Apache Archiva Repository: https://github.com/apache/archiva