continuum-commits mailing list archives

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



Mime
View raw message