Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv5546
Modified Files:
Tag: b1_5
NewsletterPublisher.java
Log Message:
CMSC-1146 Newsletter: add functionality to freeze and defrost a newsletter
edition
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-1146
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.6
retrieving revision 1.34.2.7
diff -u -b -r1.34.2.6 -r1.34.2.7
--- NewsletterPublisher.java 14 Nov 2008 07:01:17 -0000 1.34.2.6
+++ NewsletterPublisher.java 18 Nov 2008 03:14:18 -0000 1.34.2.7
@@ -57,7 +57,8 @@
// if needed to prompt user this validate will be remove to Action
String originalBody = "";
String status =
newsletterEditionNode.getStringValue("process_status");
- if (EditionStatus.INITIAL.value().equals(status)) {
+ String static_html =
newsletterEditionNode.getStringValue("static_html");
+ if (EditionStatus.INITIAL.value().equals(status) &&
StringUtils.isEmpty(static_html)) {
originalBody = getBody(publication, subscription);
}
else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
