You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/03/20 16:35:07 UTC
svn commit: r756532 - in
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp:
components/projectGroupNotifierSummaryComponent.jsp
notifier/deleteNotifier.jsp projectView.jsp
Author: ctan
Date: Fri Mar 20 15:35:06 2009
New Revision: 756532
URL: http://svn.apache.org/viewvc?rev=756532&view=rev
Log:
[CONTINUUM-2135] confirm before deleting a project-level notifier
Submitted By: Jose Morales Martinez
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=756532&r1=756531&r2=756532&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Fri Mar 20 15:35:06 2009
@@ -59,7 +59,6 @@
<s:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</s:param>
<s:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</s:param>
<s:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</s:param>
- <s:param name="confirmed" value="false"/>
</s:url>
<s:a href="%{removeUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -131,11 +130,10 @@
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
- <s:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
+ <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
<s:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</s:param>
<s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
<s:param name="notifierId">${pageScope.projectNotifierSummary.id}</s:param>
- <s:param name="confirmed" value="false"/>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{removeUrl}">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?rev=756532&r1=756531&r2=756532&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Fri Mar 20 15:35:06 2009
@@ -51,6 +51,7 @@
<s:hidden name="notifierId"/>
<s:hidden name="projectId"/>
<s:hidden name="projectGroupId" />
+ <s:hidden name="fromGroupPage" />
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
</s:form>
</s:else>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=756532&r1=756531&r2=756532&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Fri Mar 20 15:35:06 2009
@@ -135,7 +135,7 @@
<redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.notifier.fromProject}">
- <s:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
+ <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
<s:param name="projectId" value="project.id"/>
<s:param name="projectGroupId">${project.projectGroup.id}</s:param>
<s:param name="notifierType">${notifier.type}</s:param>