Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
In directory
james.mmbase.org:/tmp/cvs-serv27000/portlets-newsletter/src/webapp/WEB-INF
Modified Files:
struts-newsletter.xml struts-newsletterpublication.xml
Log Message:
CMSC-713
The confirmation screen now notifies the editor if he/she is trying to send a
publication for the second time.
The title of a publication also indicates to the editor if a publication has
already been sent, because sent publications have a date/time postfix.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-713
Index: struts-newsletter.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- struts-newsletter.xml 16 Nov 2007 11:37:50 -0000 1.1
+++ struts-newsletter.xml 8 Mar 2008 15:49:47 -0000 1.2
@@ -27,8 +27,12 @@
<forward name="newsletterdelete"
path="/editors/newsletter/newsletterdelete.jsp" redirect="false" />
<forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
</action>
-
-
+ <action path="/editors/newsletter/NewsletterPause"
type="com.finalist.newsletter.forms.NewsletterPause" unknown="false"
validate="false">
+ <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ </action>
+ <action path="/editors/newsletter/NewsletterResume"
type="com.finalist.newsletter.forms.NewsletterResume" unknown="false"
validate="false">
+ <forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
+ </action>
<!-- ==== Select page nodes ==== -->
Index: struts-newsletterpublication.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletterpublication.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- struts-newsletterpublication.xml 17 Jan 2008 21:47:15 -0000 1.5
+++ struts-newsletterpublication.xml 8 Mar 2008 15:49:47 -0000 1.6
@@ -28,7 +28,8 @@
<forward name="success"
path="/editors/site/refreshpages.jsp" redirect="false" />
</action>
<action path="/editors/newsletter/NewsletterPublicationPublish"
type="com.finalist.newsletter.forms.NewsletterPublicationPublish"
unknown="false" validate="false">
- <forward name="confirmationpage"
path="/editors/newsletter/confirmpublication.jsp" redirect="false" />
+ <forward name="confirm_send"
path="/editors/newsletter/confirm_send.jsp" redirect="false" />
+ <forward name="confirm_resend"
path="/editors/newsletter/confirm_resend.jsp" redirect="false" />
<forward name="success"
path="/editors/newsletter/sendresults.jsp" redirect="false" />
<forward name="cancel"
path="/editors/site/refreshpagesandshow.jsp" redirect="false" />
</action>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
