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:12:12 UTC
svn commit: r1669263 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
Author: batkinson
Date: Thu Mar 26 03:12:12 2015
New Revision: 1669263
URL: http://svn.apache.org/r1669263
Log:
Fixed token usage on distributed purge configs page.
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp?rev=1669263&r1=1669262&r2=1669263&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp Thu Mar 26 03:12:12 2015
@@ -61,12 +61,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="'remPurgeToken' + #attr['dirPurge'].id"/>
+ <s:token name="%{#attr['tname']}"/>
<s:url id="removePurgeConfigUrl" action="removeDistributedPurgeConfig">
<s:param name="purgeConfigId"><c:out value="${pageScope.dirPurge.id}"/></s:param>
<s:param name="description"><c:out value="${pageScope.dirPurge.description}"/></s:param>
- <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>