Return-Path: 
 <commits-return-7256-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
X-Original-To: apmail-continuum-commits-archive@www.apache.org
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A9519175C4
	for <apmail-continuum-commits-archive@www.apache.org>;
 Thu, 26 Mar 2015 03:12:05 +0000 (UTC)
Received: (qmail 1928 invoked by uid 500); 26 Mar 2015 03:12:05 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 1898 invoked by uid 500); 26 Mar 2015 03:12:05 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 1889 invoked by uid 99); 26 Mar 2015 03:12:05 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2015 03:12:05 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 66BDBAC006C
	for <commits@continuum.apache.org>; Thu, 26 Mar 2015 03:12:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1669261 - in /continuum/trunk/continuum-webapp/src/main:
 resources/struts.xml
 webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
 webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp
Date: Thu, 26 Mar 2015 03:12:05 -0000
To: commits@continuum.apache.org
From: batkinson@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150326031205.66BDBAC006C@hades.apache.org>

Author: batkinson
Date: Thu Mar 26 03:12:04 2015
New Revision: 1669261

URL: http://svn.apache.org/r1669261
Log:
Fixed token usage on build definition template pages.

Modified:
    continuum/trunk/continuum-webapp/src/main/resources/struts.xml
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp

Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=1669261&r1=1669260&r2=1669261&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Thu Mar 26 03:12:04 2015
@@ -943,6 +943,9 @@
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp</result>
       <result name="error">/WEB-INF/jsp/error/buildDefinitionError.jsp</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">deleteBuildDefinition</param>
+      </interceptor-ref>
     </action>
 
     <action name="displayQueues" class="queues" method="display">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=1669261&r1=1669260&r2=1669261&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Thu Mar 26 03:12:04 2015
@@ -56,12 +56,13 @@
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
             </c:when>
             <c:otherwise>
-              <s:token/>
+              <s:set var="tname" value="'delTemplateToken' + #attr['template'].id" scope="page"/>
+              <s:token name="%{#attr['tname']}"/>
               <s:url id="deleteUrl" action="deleteDefinitionTemplate" namespace="/">
                 <s:param name="buildDefinitionTemplate.id"><c:out value="${pageScope.template.id}"/></s:param>
                 <s:param name="buildDefinitionTemplate.name"><c:out value="${pageScope.template.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="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </c:otherwise>
@@ -108,9 +109,13 @@
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
             </c:when>
             <c:otherwise>
+              <s:set var="tname" value="'delBuildDefToken' + #attr['buildDefinitionSummary'].id" scope="page"/>
+              <s:token name="%{#attr['tname']}" />
               <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" namespace="/">
                 <s:param name="buildDefinition.id"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
                 <s:param name="buildDefinition.description"><c:out value="${pageScope.buildDefinitionSummary.description}"/></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="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </c:otherwise>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp?rev=1669261&r1=1669260&r2=1669261&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp Thu Mar 26 03:12:04 2015
@@ -38,6 +38,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteBuildDefinitionAsTemplate" method="post">
+            <s:token/>
             <s:hidden name="buildDefinition.id"/>
             <s:hidden name="confirmed" value="true"/>
             <s:submit value="%{getText('delete')}" theme="simple"/>