continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r692965 - in /continuum/branches/continuum-transient-state/continuum-webapp/src/main: resources/xwork.xml webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Date Mon, 08 Sep 2008 00:32:09 GMT
Author: ctan
Date: Sun Sep  7 17:32:08 2008
New Revision: 692965

URL: http://svn.apache.org/viewvc?rev=692965&view=rev
Log:
cancelling a build should go back to project group summary page, not the build results page

Modified:
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml
    continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp

Modified: continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml?rev=692965&r1=692964&r2=692965&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml
(original)
+++ continuum/branches/continuum-transient-state/continuum-webapp/src/main/resources/xwork.xml
Sun Sep  7 17:32:08 2008
@@ -427,7 +427,10 @@
     </action>
 
     <action name="cancelBuild" class="cancelBuild">
-      <result name="success" type="chain">buildResults</result>
+      <result name="success" type="redirect-action">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
     </action>
     
     <action name="cancelBuilds" class="cancelBuild" method="cancelBuilds">

Modified: continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=692965&r1=692964&r2=692965&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
(original)
+++ continuum/branches/continuum-transient-state/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
Sun Sep  7 17:32:08 2008
@@ -120,6 +120,7 @@
                 <c:otherwise>
                   <ww:url id="cancelBuildProjectUrl" action="cancelBuild" namespace="/"
includeParams="none">
                     <ww:param name="projectId" value="${project.id}"/>
+                    <ww:param name="projectGroupId" value="${project.projectGroupId}"/>
                   </ww:url>
                   <c:choose>
                     <c:when test="${project.state != 8}">



Mime
View raw message