Author: kevinshen
Date: 2009-05-11 07:57:50 +0200 (Mon, 11 May 2009)
New Revision: 35059
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java
Log:
CMSC-1393 Newsletter - Wrong value for newsletter subject when sending mails.
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java
2009-05-11 05:56:58 UTC (rev 35058)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java
2009-05-11 05:57:50 UTC (rev 35059)
@@ -260,7 +260,7 @@
query.setNodeStep(parameterStep);
Queries.addSortOrders(query, "logdate", "DOWN");
query.setMaxNumber(3);
- SearchUtil.addEqualConstraint(query,
logNodeManager.getField("newsletter"), Integer.valueOf(newsletterId));
+ SearchUtil.addEqualConstraint(query,
logNodeManager.getField("newsletter"), newsletterId);
SearchUtil.addEqualConstraint(query, logNodeManager.getField("userid"),
Integer.valueOf(userId));
NodeList logs = query.getList();
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java
2009-05-11 05:56:58 UTC (rev 35058)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java
2009-05-11 05:57:50 UTC (rev 35059)
@@ -92,7 +92,7 @@
setContent(message, publication, subscription, originalBody);
setRecipient(message, subscription.getEmail());
// setBody(publication, subscription, message);
- setTitle(message, newsletter.getTitle());
+ setTitle(message, publication.getSubject());
// setMIME(message, subscription.getMimeType());
Transport.send(message);
@@ -214,7 +214,7 @@
content = getPersonalise().personalise(content, subscription,
publication);
log.debug("the content sent is Personalized:" + content);
}else {
- log.info("url---->" + url);
+ log.debug("url---->" + url);
content = NewsletterGenerator.generate(url,
subscription.getMimeType());
}
cache.add(url, content);
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java
2009-05-11 05:56:58 UTC (rev 35058)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java
2009-05-11 05:57:50 UTC (rev 35059)
@@ -139,6 +139,7 @@
pub.setId(newsletterPublicationNode.getNumber());
pub.setStatus(Publication.STATUS.valueOf(newsletterPublicationNode.getStringValue("status")));
pub.setUrl(getPublicationURL(cloud,number));
+ pub.setSubject(newsletterPublicationNode.getStringValue("subject"));
Newsletter newsletter = new Newsletter();
Node node = relatedNewsletters.get(0);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
