You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/19 12:48:32 UTC
svn commit: r447809 - in
/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
webapp/components/buildDefinitionSummaryComponent.jsp
Author: carlos
Date: Tue Sep 19 03:48:31 2006
New Revision: 447809
URL: http://svn.apache.org/viewvc?view=rev&rev=447809
Log:
[CONTINUUM-862] Hide links for project group operations based on users permissions
Modified:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=447809&r1=447808&r2=447809
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Sep 19 03:48:31 2006
@@ -41,6 +41,8 @@
private int projectGroupId;
private int projectId;
+
+ private ProjectGroup projectGroup;
private List projectBuildDefinitionSummaries = new ArrayList();
@@ -52,7 +54,8 @@
{
try
{
- projectGroupId = getContinuum().getProjectGroupByProjectId( projectId ).getId();
+ projectGroup = getContinuum().getProjectGroupByProjectId( projectId );
+ projectGroupId = projectGroup.getId();
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
projectBuildDefinitionSummaries = gatherProjectBuildDefinitionSummaries( projectId );
@@ -74,7 +77,7 @@
{
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
- ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
+ projectGroup = getContinuum().getProjectGroup( projectGroupId );
for (Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); )
{
@@ -120,7 +123,7 @@
{
List summaryList = new ArrayList();
- ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
+ projectGroup = getContinuum().getProjectGroup( projectGroupId );
for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); )
{
@@ -196,5 +199,15 @@
public void setAllBuildDefinitionSummaries( List allBuildDefinitionSummaries )
{
this.allBuildDefinitionSummaries = allBuildDefinitionSummaries;
+ }
+
+ public ProjectGroup getProjectGroup()
+ {
+ return projectGroup;
+ }
+
+ public void setProjectGroup( ProjectGroup projectGroup )
+ {
+ this.projectGroup = projectGroup;
}
}
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=447809&r1=447808&r2=447809
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp Tue Sep 19 03:48:31 2006
@@ -44,11 +44,11 @@
<ww:param name="confirmed" value="false"/>
</ww:url>
</ww:else>
- <c:if test="${projectGroup.permissions.write}">
+ <c:if test="${requestScope.projectGroup.permissions.write}">
<ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
</c:if>
- <c:if test="${projectGroup.permissions.delete}">
+ <c:if test="${requestScope.projectGroup.permissions.delete}">
<ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
</c:if>
</ec:column>