Return-Path: 
 <continuum-commits-return-2337-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 65393 invoked from network); 19 Sep 2006 01:29:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Sep 2006 01:29:54 -0000
Received: (qmail 32794 invoked by uid 500); 19 Sep 2006 01:29:53 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 32763 invoked by uid 500); 19 Sep 2006 01:29:53 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 32750 invoked by uid 99); 19 Sep 2006 01:29:53 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org)
 (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2006 18:29:53 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME
X-Ecelerity-Macros: i=140.211.166.113 p=eris.apache.osuosl.org
 ir=113.166.211.140
Received: from ([140.211.166.113:54487] helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP
	id 17/70-25246-F084F054 for <continuum-commits@maven.apache.org>;
 Mon, 18 Sep 2006 18:29:52 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id AC5A71A981A; Mon, 18 Sep 2006 18:29:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r447668 - in
 /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp:
 ./ components/
Date: Tue, 19 Sep 2006 01:29:49 -0000
To: continuum-commits@maven.apache.org
From: carlos@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060919012949.AC5A71A981A@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: carlos
Date: Mon Sep 18 18:29:48 2006
New Revision: 447668

URL: http://svn.apache.org/viewvc?view=rev&rev=447668
Log:
Delete subelements requires delete permission in projcet group

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=447668&r1=447667&r2=447668
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp Mon Sep 18 18:29:48 2006
@@ -28,7 +28,9 @@
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
           </ww:url>
           <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
+        </c:if>
           &nbsp;
+        <c:if test="${projectGroup.permissions.delete}">
           <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
             <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
@@ -76,7 +78,9 @@
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
           </ww:url>
           <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
-          &nbsp;
+        </c:if>
+        &nbsp;
+        <c:if test="${projectGroup.permissions.delete}">
           <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
             <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>

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=447668&r1=447667&r2=447668
==============================================================================
--- 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 Mon Sep 18 18:29:48 2006
@@ -18,38 +18,40 @@
       <ec:column property="scheduleName" title="schedule"/>
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
-      <c:if test="${projectGroup.permissions.write}">
-        <ec:column property="actions" title="&nbsp;">
-          <!-- if the from is PROJECT then render the links differently -->
-          <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
-            <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-            </ww:url>
-            <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
-              <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="confirmed" value="false"/>
-            </ww:url>
-          </ww:if>
-          <ww:else>
-            <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-              <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-            </ww:url>
-            <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
-              <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-              <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="confirmed" value="false"/>
-            </ww:url>
-          </ww:else>
+      <ec:column property="actions" title="&nbsp;">
+        <%-- if the from is PROJECT then render the links differently --%>
+        <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
+            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+          </ww:url>
+          <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
+            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
+            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+            <ww:param name="confirmed" value="false"/>
+          </ww:url>
+        </ww:if>
+        <ww:else>
+          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
+            <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
+            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+          </ww:url>
+          <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
+            <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
+            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+            <ww:param name="confirmed" value="false"/>
+          </ww:url>
+        </ww:else>
+        <c:if test="${projectGroup.permissions.write}">
           <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
-          &nbsp;
+        </c:if>
+        &nbsp;
+        <c:if test="${projectGroup.permissions.delete}">
           <ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
-        </ec:column>
-      </c:if>
+        </c:if>
+      </ec:column>
     </ec:row>
   </ec:table>
 </ww:i18n>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=447668&r1=447667&r2=447668
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp Mon Sep 18 18:29:48 2006
@@ -77,7 +77,7 @@
         </c:if>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%">
-        <c:if test="${pageScope.projectGroup.permissions.write}">
+        <c:if test="${pageScope.projectGroup.permissions.delete}">
           <c:choose>
             <c:when
                 test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?view=diff&rev=447668&r1=447667&r2=447668
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Mon Sep 18 18:29:48 2006
@@ -62,7 +62,7 @@
             </ec:column>
             <ec:column property="deleteAction" title="Remove" width="1%">
               <center>
-                <c:if test="${projectGroup.permissions.write}">
+                <c:if test="${projectGroup.permissions.delete}">
                   <c:choose>
                     <c:when
                         test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">