You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2011/05/19 13:43:31 UTC
svn commit: r1124691 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
Author: brett
Date: Thu May 19 11:43:31 2011
New Revision: 1124691
URL: http://svn.apache.org/viewvc?rev=1124691&view=rev
Log:
[MRM-1474] workaround url path mapping problems that rewrites HTML and doesn't detect the path in JavaScript
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp?rev=1124691&r1=1124690&r2=1124691&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp Thu May 19 11:43:31 2011
@@ -46,21 +46,21 @@
<script type="text/javascript">
<!--
- function removeFiletypePattern(filetypeId, pattern)
+ function removeFiletypePattern(action, filetypeId, pattern)
{
var f = document.getElementById('filetypeForm');
- f.action = "${removeFiletypePatternUrl}";
+ f.action = action;
f['pattern'].value = pattern;
f['fileTypeId'].value = filetypeId;
f.submit();
}
- function addFiletypePattern(filetypeId, newPatternId)
+ function addFiletypePattern(action, filetypeId, newPatternId)
{
var f = document.forms['filetypeForm'];
- f.action = "${addFiletypePatternUrl}";
+ f.action = action;
f.elements['pattern'].value = document.getElementById(newPatternId).value;
f.elements['fileTypeId'].value = filetypeId;
f.submit();
@@ -114,7 +114,7 @@
</td>
<td class="controls ${bgcolor}">
<s:a href="#" title="Remove [%{#attr.escapedPattern}] Pattern from [%{#attr.filetypeId}]"
- onclick="removeFiletypePattern( '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )"
+ onclick="removeFiletypePattern( '%{#attr.removeFiletypePatternUrl}', '%{#attr.filetypeId}', '%{#attr.escapedPattern}' )"
theme="simple">
<img src="${iconDeleteUrl}" />
</s:a>
@@ -130,7 +130,7 @@
<td>
<s:a href="#"
title="Add Pattern to [%{#attr.filetypeId}]"
- onclick="addFiletypePattern( '%{#attr.filetypeId}', 'newpattern_%{#attr.j.index}' )"
+ onclick="addFiletypePattern( '%{#attr.addFiletypePatternUrl}', '%{#attr.filetypeId}', 'newpattern_%{#attr.j.index}' )"
theme="simple">
<img src="${iconCreateUrl}" />
</s:a>
@@ -213,7 +213,7 @@
<s:form method="post" action="repositoryScanning!updateInvalidConsumers"
namespace="/admin" validate="false" theme="simple">
- <s:token/>
+ <s:token/>
<table class="consumers">
<tr>
<th> </th>