Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory
james.mmbase.org:/tmp/cvs-serv4932/portlets-newsletter/src/java/com/finalist/newsletter/publisher
Modified Files:
NewsletterPublisher.java
Log Message:
CMSC-1305 Newsletter: add link to send email inside plain-text section
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-1305
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- NewsletterPublisher.java 24 Feb 2009 05:08:12 -0000 1.49
+++ NewsletterPublisher.java 24 Feb 2009 05:19:37 -0000 1.50
@@ -36,7 +36,6 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.domain.Subscription;
@@ -70,11 +69,10 @@
if("text/plain".equals(subscription.getMimeType())){
originalBody += url+"\n";
}
- String status =
newsletterEditionNode.getStringValue("process_status");
String static_html = "";
if (newsletterEditionNode.getValueWithoutProcess("static_html") !=
null)
static_html =
(String)newsletterEditionNode.getValueWithoutProcess("static_html");
- if (EditionStatus.INITIAL.value().equals(status) &&
StringUtils.isEmpty(static_html)) {
+ if (StringUtils.isEmpty(static_html)) {
originalBody += getBody(publication, subscription);
}
else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
