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:57 UTC
svn commit: r1669259 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
Author: batkinson
Date: Thu Mar 26 03:11:57 2015
New Revision: 1669259
URL: http://svn.apache.org/r1669259
Log:
Fixed token usage on build agents page.
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=1669259&r1=1669258&r2=1669259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Thu Mar 26 03:11:57 2015
@@ -62,11 +62,12 @@
</s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <s:token/>
+ <s:set var="tname" value="'remBuildAgentToken' + #attr['buildAgent'].url.hashCode()" scope="page"/>
+ <s:token name="%{#attr['tname']}"/>
<s:url id="removeBuildAgentUrl" action="deleteBuildAgent">
<s:param name="buildAgent.url"><c:out value="${pageScope.buildAgent.url}"/></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="%{removeBuildAgentUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>
@@ -111,11 +112,12 @@
</s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <s:token/>
+ <s:set var='tname' value="'remGroupToken' + #attr['buildAgentGroup'].name" scope="page"/>
+ <s:token name="%{#attr['tname']}"/>
<s:url id="removeBuildAgentGroupUrl" action="deleteBuildAgentGroup">
<s:param name="buildAgentGroup.name"><c:out value="${pageScope.buildAgentGroup.name}"/></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="%{removeBuildAgentGroupUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>