continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r488260 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/notifier/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/components/
Date Mon, 18 Dec 2006 12:57:35 GMT
Author: evenisse
Date: Mon Dec 18 04:57:34 2006
New Revision: 488260

URL: http://svn.apache.org/viewvc?view=rev&rev=488260
Log:
[CONTINUUM-1062] Add a confirmation page when deleting a project group notifier
Submitted by: Lester Ecarma

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java?view=diff&rev=488260&r1=488259&r2=488260
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
Mon Dec 18 04:57:34 2006
@@ -89,5 +89,11 @@
     {
         this.projectGroupId = projectGroupId;
     }
+    
+    public int getProjectId()
+    {
+        //flags that this is a group notifier
+        return -1;
+    }
 
 }

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?view=diff&rev=488260&r1=488259&r2=488260
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Mon Dec 18 04:57:34 2006
@@ -37,7 +37,7 @@
       </ec:column>    
       <ec:column property="deleteActions" title="Remove">
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="removeUrl" action="deleteProjectGroupNotifier" namespace="/">
+          <ww:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
             <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
             <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
             <ww:param name="confirmed" value="false"/>
@@ -82,4 +82,4 @@
       </ec:row>
     </ec:table>
   </ww:if>
-</ww:i18n>
\ No newline at end of file
+</ww:i18n>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp?view=diff&rev=488260&r1=488259&r2=488260
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp
Mon Dec 18 04:57:34 2006
@@ -20,12 +20,21 @@
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="deleteProjectNotifier.action" method="post">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId" />
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          <ww:if test="${projectId == -1}">
+            <ww:form action="deleteProjectGroupNotifier.action" method="post">
+              <ww:hidden name="notifierId"/>
+              <ww:hidden name="projectGroupId" />
+              <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            </ww:form>
+          </ww:if>
+          <ww:else>
+            <ww:form action="deleteProjectNotifier.action" method="post">
+              <ww:hidden name="notifierId"/>
+              <ww:hidden name="projectId"/>
+              <ww:hidden name="projectGroupId" />
+              <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            </ww:form>
+          </ww:else>
         </div>
       </div>
     </body>



Mime
View raw message