Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv9018/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationPublish.java
NewsletterPublicationSendEmail.java
Log Message:
CMSC-811,Create a newsletter publication,deal with sending mail when empty and
newsletter is paused
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-811
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterPublicationPublish.java 29 Apr 2008 01:37:05 -0000 1.8
+++ NewsletterPublicationPublish.java 30 Apr 2008 07:30:10 -0000 1.9
@@ -22,6 +22,7 @@
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.newsletter.util.NewsletterUtil;
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.services.NewsletterPublicationService;
@@ -40,6 +41,10 @@
NewsletterPublicationService publciationService =
NewsletterServiceFactory.getNewsletterPublicationService();
int number = Integer.parseInt(getParameter(request, "number", true));
+
if(NewsletterUtil.isPaused(NewsletterPublicationUtil.getNewsletterByPublicationNumber(number)))
{
+ request.setAttribute("isPaused", true);
+ return mapping.findForward(SUCCESS);
+ }
Node publicationNode = cloud.getNode(number);
if (isSendAction(request)) {
Index: NewsletterPublicationSendEmail.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterPublicationSendEmail.java 29 Apr 2008 08:58:19 -0000 1.3
+++ NewsletterPublicationSendEmail.java 30 Apr 2008 07:30:10 -0000 1.4
@@ -18,6 +18,8 @@
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
+import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterPublicationSendEmail extends MMBaseFormlessAction {
@@ -34,6 +36,10 @@
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)))
{
+ request.setAttribute("isPaused", true);
+ return mapping.findForward(SUCCESS);
+ }
if (isSendAction(request)) {
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
