You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/03/26 04:11:28 UTC
svn commit: r1669252 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
Author: batkinson
Date: Thu Mar 26 03:11:28 2015
New Revision: 1669252
URL: http://svn.apache.org/r1669252
Log:
[CONTINUUM-2665] Fixed repository purge token handling with same fix as directories.
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=1669252&r1=1669251&r2=1669252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Thu Mar 26 03:11:28 2015
@@ -78,12 +78,13 @@
<s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <s:token/>
+ <s:set var="tname" value="'repoPurgeToken' + #attr['repoPurge'].id" scope="page"/>
+ <s:token name="%{#attr['tname']}"/>
<s:url id="removePurgeConfigUrl" action="removePurgeConfig">
<s:param name="purgeConfigId" value="#attr['repoPurge']id"/>
<s:param name="description" value="#attr['repoPurge'].description"/>
- <s:param name="struts.token.name">token</s:param>
- <s:param name="token"><s:property value="token"/></s:param>
+ <s:param name="struts.token.name" value="#attr['tname']"/>
+ <s:param name="%{#attr['tname']}" value="#session['struts.tokens.' + #attr['tname']]"/>
</s:url>
<s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
</ec:column>