continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r494375 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java java/org/apache/maven/continuum/web/action/ProjectGroupAction.java webapp/WEB-INF/jsp/projectGroupSummary.jsp
Date Tue, 09 Jan 2007 11:22:42 GMT
Author: evenisse
Date: Tue Jan  9 03:22:40 2007
New Revision: 494375

URL: http://svn.apache.org/viewvc?view=rev&rev=494375
Log:
Fix the Add Maven feature from a project group when the user doesn't have the project group
manager role but only the project developer role.

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp

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=494375&r1=494374&r2=494375
==============================================================================
--- 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
Tue Jan  9 03:22:40 2007
@@ -173,14 +173,6 @@
             //}
         }
 
-        if ( session.get( "lastViewedProjectGroup" ) != null )
-        {
-            selectedProjectGroup = ( (Integer) session.get( "lastViewedProjectGroup" ) ).intValue();
-        }
-        else
-        {
-            selectedProjectGroup = DEFINED_BY_POM_GROUP_ID;
-        }
         if ( disableGroupSelection == true && selectedProjectGroup != DEFINED_BY_POM_GROUP_ID
)
         {
             try
@@ -281,6 +273,7 @@
     {
         SecureActionBundle bundle = new SecureActionBundle();
         bundle.setRequiresAuthentication( true );
+
         if ( StringUtils.isEmpty( projectGroupName ) )
         {
             bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_ADD_GROUP_OPERATION
);

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=494375&r1=494374&r2=494375
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Tue Jan  9 03:22:40 2007
@@ -109,7 +109,6 @@
         throws ContinuumException
     {
         projectGroup = getContinuum().getProjectGroup( projectGroupId );
-        session.put( "lastViewedProjectGroup", new Integer( projectGroupId ) );
 
         return SUCCESS;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?view=diff&rev=494375&r1=494374&r2=494375
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Tue Jan  9 03:22:40 2007
@@ -89,9 +89,13 @@
       <div class="functnbar3">
         <c:url var="addM2ProjectUrl" value="/addMavenTwoProject!default.action">
           <c:param name="disableGroupSelection" value="true"/>
+          <c:param name="selectedProjectGroup" value="${projectGroup.id}"/>
+          <c:param name="projectGroupName" value="${projectGroup.name}"/>
         </c:url>
         <c:url var="addM1ProjectUrl" value="/addMavenOneProject!default.action">
           <c:param name="disableGroupSelection" value="true"/>
+          <c:param name="selectedProjectGroup" value="${projectGroup.id}"/>
+          <c:param name="projectGroupName" value="${projectGroup.name}"/>
         </c:url>
         <table>
           <tr>



Mime
View raw message