continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1669272 - /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Date Thu, 26 Mar 2015 03:12:47 GMT
Author: batkinson
Date: Thu Mar 26 03:12:46 2015
New Revision: 1669272

URL: http://svn.apache.org/r1669272
Log:
Fixed token usage for project summary component.

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1669272&r1=1669271&r2=1669272&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Thu Mar 26 03:12:46 2015
@@ -210,11 +210,12 @@
         <c:choose>
           <c:when
               test="${projectIdle}">
-            <s:token/>
-            <s:url id="deleteProjectUrl" value="deleteProject_default.action" namespace="/">
+            <s:set var="tname" value="'delProjectToken' + #attr['project'].id" scope="page"/>
+            <s:token name="%{#attr['tname']}"/>
+            <s:url id="deleteProjectUrl" action="deleteProject_default" namespace="/">
               <s:param name="projectId"><c:out value="${project.id}"/></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="%{deleteProjectUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">



Mime
View raw message