From continuum-commits-return-2721-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Mon Dec 18 10:45:11 2006
Return-Path: <continuum-commits-return-2721-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 76130 invoked from network); 18 Dec 2006 10:45:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Dec 2006 10:45:10 -0000
Received: (qmail 90879 invoked by uid 500); 18 Dec 2006 10:45:18 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 90859 invoked by uid 500); 18 Dec 2006 10:45:18 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 90840 invoked by uid 99); 18 Dec 2006 10:45:18 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Dec 2006 02:45:18 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Dec 2006 02:45:09 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1641A1A981D; Mon, 18 Dec 2006 02:44:22 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r488215 - in /maven/continuum/trunk/continuum-webapp/src/main:
 java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
 resources/xwork.xml webapp/WEB-INF/jsp/deleteProject.jsp
Date: Mon, 18 Dec 2006 10:44:21 -0000
To: continuum-commits@maven.apache.org
From: evenisse@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061218104422.1641A1A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: evenisse
Date: Mon Dec 18 02:44:20 2006
New Revision: 488215

URL: http://svn.apache.org/viewvc?view=rev&rev=488215
Log:
[CONTINUUM-1061] go back to the project group after deleting a project
Submitted by: Napoleon Esmundo C. Ramirez

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?view=diff&rev=488215&r1=488214&r2=488215
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Mon Dec 18 02:44:20 2006
@@ -34,6 +34,8 @@
 
     private String projectName;
 
+    private int projectGroupId;
+
     public String execute()
         throws ContinuumException
     {
@@ -45,7 +47,7 @@
     public String doDefault()
         throws ContinuumException
     {
-        Project project = getContinuum().getProject( projectId ); 
+        Project project = getContinuum().getProject( projectId );
         projectName = project.getName();
         
         return "delete";
@@ -69,5 +71,15 @@
     public String getProjectName()
     {
         return projectName;
+    }
+
+    public void setProjectGroupId( int projectGroupId )
+    {
+        this.projectGroupId = projectGroupId;
+    }
+
+    public int getProjectGroupId()
+    {
+        return projectGroupId;
     }
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=488215&r1=488214&r2=488215
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Dec 18 02:44:20 2006
@@ -158,7 +158,10 @@
 
     <action name="deleteProject" class="deleteProject">
       <result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
-      <result name="success" type="chain">groupSummary</result>
+      <result name="success" type="redirect-action">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
     </action>
 
     <action name="buildProject" class="buildProject">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp?view=diff&rev=488215&r1=488214&r2=488215
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp Mon Dec 18 02:44:20 2006
@@ -21,6 +21,7 @@
         <div class="functnbar3">
           <ww:form action="deleteProject.action" method="post">
             <ww:hidden name="projectId"/>
+            <ww:hidden name="projectGroupId"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
           </ww:form>
         </div>