Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv29994/src/java/com/finalist/newsletter/forms
Modified Files:
Tag: b1_5
NewsletterPublicationSendEmail.java
Log Message:
CMSC-1145 Newsletter: Sending testemail improvements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1145
Index: NewsletterPublicationSendEmail.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- NewsletterPublicationSendEmail.java 23 Sep 2008 10:16:00 -0000 1.9
+++ NewsletterPublicationSendEmail.java 12 Nov 2008 06:55:21 -0000 1.9.2.1
@@ -24,28 +24,35 @@
public class NewsletterPublicationSendEmail extends MMBaseFormlessAction {
- /** the parameter of action */
+ /**
+ * the parameter of action
+ */
private static final String ACTION = "action";
- /** name of submit button in jsp to send email */
+ /**
+ * name of submit button in jsp to send email
+ */
private static final String ACTION_SEND = "send";
- /** name of submit button in jsp to cancel removal */
+ /**
+ * name of submit button in jsp to cancel removal
+ */
private static final String ACTION_CANCEL = "cancel";
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
int number = Integer.parseInt(getParameter(request, "number", true));
-
if(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
+ if
(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
request.setAttribute("isPaused", true);
return mapping.findForward(SUCCESS);
}
if (isSendAction(request)) {
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
- NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");;
- publicationService.deliver(number,email,mimeType);
+ NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
+ NewsletterPublicationUtil.publish(cloud,number);
+ publicationService.deliver(number, email, mimeType);
return mapping.findForward(SUCCESS);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
