continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r565325 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java resources/xwork.xml
Date Mon, 13 Aug 2007 12:26:21 GMT
Author: evenisse
Date: Mon Aug 13 05:26:20 2007
New Revision: 565325

URL: http://svn.apache.org/viewvc?view=rev&rev=565325
Log:
[CONTINUUM-1349] Improve "add project" screen flow

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java?view=diff&rev=565325&r1=565324&r2=565325
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
Mon Aug 13 05:26:20 2007
@@ -64,7 +64,7 @@
     private boolean disableGroupSelection;
 
     private boolean scmUseCache;
-    
+
     private int projectGroupId;
 
     public String execute()
@@ -157,13 +157,19 @@
 
             return doDefault();
         }
-        
+
         if ( this.getSelectedProjectGroup() > 0 )
         {
             this.setProjectGroupId( this.getSelectedProjectGroup() );
             return "projectGroupSummary";
         }
-        
+
+        if ( result.getProjectGroups() != null && !result.getProjectGroups().isEmpty()
)
+        {
+            this.setProjectGroupId( ( (ProjectGroup) result.getProjectGroups().get( 0 ) ).getId()
);
+            return "projectGroupSummary";
+        }
+
         return SUCCESS;
     }
 

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=565325&r1=565324&r2=565325
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Aug 13 05:26:20
2007
@@ -178,6 +178,10 @@
     <action name="addMavenOneProject" class="addMavenOneProject">
       <result name="input">/WEB-INF/jsp/addMavenOneProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
+      <result name="projectGroupSummary" type="redirect-action">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
     </action>
 
     <action name="addProjectInput" class="addProject" method="input">



Mime
View raw message