Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv4897
Modified Files:
Tag: b1_5
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.34.2.10
retrieving revision 1.34.2.11
diff -u -b -r1.34.2.10 -r1.34.2.11
--- NewsletterPublisher.java 3 Dec 2008 09:19:23 -0000 1.34.2.10
+++ NewsletterPublisher.java 24 Feb 2009 05:19:17 -0000 1.34.2.11
@@ -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;
@@ -65,21 +64,24 @@
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node newsletterEditionNode = cloud.getNode(publication.getId());
// if needed to prompt user this validate will be remove to Action
+ String url = NewsletterUtil.getTermURL(publication.getUrl(),
subscription.getTerms(), publication.getId());
String originalBody = "";
- String status =
newsletterEditionNode.getStringValue("process_status");
- String static_html = null;
+ if("text/plain".equals(subscription.getMimeType())){
+ originalBody += url+"\n";
+ }
+ 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)) {
- originalBody = getBody(publication, subscription);
+ if (StringUtils.isEmpty(static_html)) {
+ originalBody += getBody(publication, subscription);
}
else {
if("text/plain".equals(subscription.getMimeType())){
OnlyText onlyText = new OnlyText();
- originalBody = onlyText.html2Text(static_html);
+ originalBody += onlyText.html2Text(static_html);
}
else {
- originalBody = static_html;
+ originalBody += static_html;
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
