continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r700250 - in /continuum/branches/continuum-1.2.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ProjectGroupAction.java webapp/WEB-INF/jsp/projectGroupEdit.jsp
Date Mon, 29 Sep 2008 20:51:22 GMT
Author: olamy
Date: Mon Sep 29 13:51:21 2008
New Revision: 700250

URL: http://svn.apache.org/viewvc?rev=700250&view=rev
Log:
[CONTINUUM-1899]  Cannot edit Project Group homepage URL


Modified:
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=700250&r1=700249&r2=700250&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Mon Sep 29 13:51:21 2008
@@ -138,7 +138,7 @@
         }
 
         projectGroup = getContinuum().getProjectGroupWithProjects( projectGroupId );
-
+       
         List<BuildDefinition> projectGroupBuildDefs =
             getContinuum().getBuildDefinitionsForProjectGroup( projectGroupId );
 
@@ -296,7 +296,7 @@
     }
 
     public String edit()
-        throws ContinuumException
+        throws ContinuumException, CycleDetectedException
     {
         try
         {
@@ -323,7 +323,7 @@
         name = projectGroup.getName();
 
         description = projectGroup.getDescription();
-
+       
         projectList = projectGroup.getProjects();
 
         if ( projectList != null )
@@ -362,6 +362,14 @@
 
         repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
 
+        Project rootProject = ( getContinuum().getProjectsInBuildOrder( getContinuum()
+            .getProjectsInGroupWithDependencies( projectGroup.getId() ) ) ).get( 0 );
+        
+        if (rootProject != null)
+        {
+            setUrl( rootProject.getUrl() );
+        }
+        
         return SUCCESS;
     }
 
@@ -443,6 +451,13 @@
 
         getContinuum().updateProjectGroup( projectGroup );
 
+        Project rootProject = ( getContinuum().getProjectsInBuildOrder( getContinuum()
+            .getProjectsInGroupWithDependencies( projectGroupId ) ) ).get( 0 );
+        
+        rootProject.setUrl( url );
+        
+        getContinuum().updateProject( rootProject );
+        
         Iterator keys = projects.keySet().iterator();
         while ( keys.hasNext() )
         {

Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=700250&r1=700249&r2=700250&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
Mon Sep 29 13:51:21 2008
@@ -52,6 +52,7 @@
                 <ww:textfield label="%{getText('projectGroup.description.label')}" name="description"
disabled="%{projectInCOQueue}"/>
                 <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId"
list="repositories" 
                            listKey="id" listValue="name" disabled="%{disabledRepositories}"/>

+                <ww:textfield label="%{getText('projectGroup.url.label')}" name="url"
disabled="%{projectInCOQueue}"/>
               </tbody>
             </table>
             



Mime
View raw message