Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv4756/src/java/com/finalist/newsletter/forms
Modified Files:
Tag: b1_6
NewsletterPublicationSendEmail.java
Log Message:
CMSC-1315 - Stacktrace in Newsletter usage
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-1315
Index: NewsletterPublicationSendEmail.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationSendEmail.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- NewsletterPublicationSendEmail.java 18 Dec 2008 13:29:55 -0000 1.12
+++ NewsletterPublicationSendEmail.java 4 Mar 2009 10:26:48 -0000 1.12.2.1
@@ -15,6 +15,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
+import org.mmbase.remotepublishing.PublishManager;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
@@ -48,12 +49,17 @@
return mapping.findForward(SUCCESS);
}
if (isSendAction(request)) {
+ if(PublishManager.isPublished(cloud.getNode(number))){
String email = getParameter(request, "email");
String mimeType = request.getParameter("mimetype");
NewsletterPublicationService publicationService =
(NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
NewsletterPublicationUtil.publish(cloud, number);
publicationService.deliver(number, email, mimeType);
return mapping.findForward(SUCCESS);
+ } else {
+ request.setAttribute("errormessage", true);
+ return mapping.findForward("inputpage");
+ }
}
if (isCancelAction(request)) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
