Author: evenisse
Date: Fri Dec 15 02:58:24 2006
New Revision: 487515

URL: http://svn.apache.org/viewvc?view=rev&rev=487515
Log:
[CONTINUUM-1056] Fix error when scm url in project edit screen
Submitted by: Lester Ecarma

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?view=diff&rev=487515&r1=487514&r2=487515
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Fri Dec 15 02:58:24 2006
@@ -41,17 +41,10 @@
      */
     private ProjectGroup projectGroup;
 
-    /**
-     * Identifier for the target {@link ProjectGroup} to obtain for 
-     * viewing.
-     */
-    private int projectGroupId;
-
     public String execute()
         throws ContinuumException
     {
-        projectGroup = getContinuum().getProjectGroup( projectGroupId );
-
+        projectGroup = getContinuum().getProjectGroupByProjectId( projectId );
         project = getContinuum().getProjectWithAllDetails( projectId );
 
         return SUCCESS;
@@ -73,24 +66,6 @@
     }
 
     /**
-     * Return the identifier for the {@link ProjectGroup} to view.
-     * @return the projectGroupId
-     */
-    public int getProjectGroupId()
-    {
-        return projectGroupId;
-    }
-
-    /**
-     * Sets the {@link ProjectGroup} identifier to obtain for viewing.
-     * @param projectGroupId the projectGroupId to set
-     */
-    public void setProjectGroupId( int projectGroupId )
-    {
-        this.projectGroupId = projectGroupId;
-    }
-
-    /**
      * Returns the {@link ProjectGroup} instance obtained for 
      * the specified project group Id, or null if it were not set.
      * 
@@ -100,5 +75,4 @@
     {
         return projectGroup;
     }
-
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp?view=diff&rev=487515&r1=487514&r2=487515
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp Fri Dec 15 02:58:24 2006
@@ -6,22 +6,22 @@
   <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
 
     <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
-        <ww:param name="projectGroupId" value="projectGroupId"/>
+        <ww:param name="projectGroupId" value="project.projectGroup.id"/>
     </ww:url>
     <ww:url id="viewUrl" action="projectView" includeParams="none">
         <ww:param name="projectId" value="projectId"/>
         <ww:param name="tab" value="view"/>
-        <ww:param name="projectGroupId" value="projectGroupId"/>
+        <ww:param name="projectGroupId" value="project.projectGroup.id"/>
     </ww:url>
     <ww:url id="buildResultsUrl" action="buildResults" includeParams="none">
         <ww:param name="projectId" value="projectId"/>
         <ww:param name="tab" value="buildResults"/>
-        <ww:param name="projectGroupId" value="projectGroupId"/>
+        <ww:param name="projectGroupId" value="project.projectGroup.id"/>
     </ww:url>
     <ww:url id="workingCopyUrl" action="workingCopy" includeParams="none">
         <ww:param name="projectId" value="projectId"/>
         <ww:param name="tab" value="workingCopy"/>
-        <ww:param name="projectGroupId" value="projectGroupId"/>
+        <ww:param name="projectGroupId" value="project.projectGroup.id"/>
     </ww:url>
 
     <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}"><ww:text name="projectGroup.tab.summary"/></a>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?view=diff&rev=487515&r1=487514&r2=487515
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Fri Dec 15 02:58:24 2006
@@ -14,7 +14,6 @@
 
         <jsp:include page="/WEB-INF/jsp/navigations/ProjectMenu.jsp">
           <jsp:param name="tab" value="view"/>
-          <jsp:param name="projectGroupId" value="%{project.projectGroup.id}"/>
         </jsp:include>
 
         <h3><ww:text name="projectView.section.title"/></h3>