Return-Path: 
 <commits-return-4283-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 32829 invoked from network); 8 Sep 2008 00:32:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Sep 2008 00:32:30 -0000
Received: (qmail 83766 invoked by uid 500); 8 Sep 2008 00:32:28 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 83737 invoked by uid 500); 8 Sep 2008 00:32:28 -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 83728 invoked by uid 99); 8 Sep 2008 00:32:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Sep 2008 17:32:28 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2008 00:31:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BECE523889B7; Sun,  7 Sep 2008 17:32:09 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: commits@continuum.apache.org
From: ctan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080908003209.BECE523889B7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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}">