continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
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 GMT
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"/>



Mime
View raw message