continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548071 - in /continuum/branches/CONTINUUM-2713/continuum-webapp/src/main: resources/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/components/ webapp/WEB-INF/jsp/notifier/
Date Thu, 05 Dec 2013 10:00:59 GMT
Author: brett
Date: Thu Dec  5 10:00:58 2013
New Revision: 1548071

URL: http://svn.apache.org/r1548071
Log:
[CONTINUUM-2713] remove DMI from notifier actions

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml?rev=1548071&r1=1548070&r2=1548071&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml Thu Dec
 5 10:00:58 2013
@@ -1287,8 +1287,11 @@
     <!--
     * notifier actions :: Project
     -->
-    <action name="deleteProjectNotifier" class="deleteProjectNotifier">
+    <action name="deleteProjectNotifier_default" class="deleteProjectNotifier" method="default">
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+    </action>
+
+    <action name="deleteProjectNotifier" class="deleteProjectNotifier">
       <result name="success" type="chain">projectView</result>
       <result name="to_group_page" type="chain">projectGroupNotifier</result>
       <interceptor-ref name="configuredContinuumStack">
@@ -1298,6 +1301,10 @@
 
     <action name="addProjectNotifier" class="addProjectNotifier" method="doDefault">
       <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+    </action>
+
+    <action name="addProjectNotifier_submit" class="addProjectNotifier" method="execute">
+      <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
       <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
       <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
       <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
@@ -1367,8 +1374,11 @@
     * notifier actions :: Project Group
     -->
 
-    <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
+    <action name="deleteProjectGroupNotifier_default" class="deleteGroupNotifier" method="default">
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+    </action>
+
+    <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
       <result name="success" type="chain">projectGroupNotifier</result>
       <interceptor-ref name="configuredContinuumStack">
         <param name="tokenSession.includeMethods">execute</param>
@@ -1377,6 +1387,10 @@
 
     <action name="addProjectGroupNotifier" class="addGroupNotifier" method="doDefault">
       <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+    </action>
+
+    <action name="addProjectGroupNotifier_submit" class="addGroupNotifier" method="execute">
+      <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
       <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
       <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
       <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=1548071&r1=1548070&r2=1548071&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Thu Dec  5 10:00:58 2013
@@ -55,7 +55,7 @@
       </ec:column>    
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-          <s:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
+          <s:url id="removeUrl" action="deleteProjectGroupNotifier_default.action" namespace="/">
             <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
             <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
             <s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?rev=1548071&r1=1548070&r2=1548071&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
Thu Dec  5 10:00:58 2013
@@ -27,10 +27,10 @@
       <div id="axial" class="h3">
       
         <s:if test="projectId > 0">
-            <s:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none"
/>
+            <s:url id="actionUrl" value="addProjectNotifier_submit" includeParams="none"
/>
         </s:if>
         <s:else>
-            <s:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none"
/>
+            <s:url id="actionUrl" value="addProjectGroupNotifier_submit" includeParams="none"
/>
         </s:else>
        
         <h3><s:text name="notifier.section.add.title"/></h3>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=1548071&r1=1548070&r2=1548071&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
Thu Dec  5 10:00:58 2013
@@ -156,7 +156,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!default.action"
namespace="/">
+                      <s:url id="removeUrl" action="deleteProjectNotifier_default.action"
namespace="/">
                         <s:param name="projectId"><c:out value="${project.id}"/></s:param>
                         <s:param name="projectGroupId"><c:out value="${project.projectGroup.id}"/></s:param>
                         <s:param name="notifierType"><c:out value="${notifier.type}"/></s:param>
@@ -180,7 +180,7 @@
         </c:if>
         <div class="functnbar3">
            <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
-          <s:form action="addProjectNotifier!default.action" method="post">
+          <s:form action="addProjectNotifier.action" method="post">
             <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
             <input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>
             <s:submit value="%{getText('add')}" theme="simple"/>



Mime
View raw message