Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory
james.mmbase.org:/tmp/cvs-serv26065/java/com/finalist/newsletter/publisher
Modified Files:
Tag: b1_5
NewsletterPublisher.java
Log Message:
CMSC-1146 Newsletter: add functionality to freeze and defrost a newsletter
edition add fresh function ,escape html and gray the edited icon
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.7
retrieving revision 1.34.2.8
diff -u -b -r1.34.2.7 -r1.34.2.8
--- NewsletterPublisher.java 18 Nov 2008 03:14:18 -0000 1.34.2.7
+++ NewsletterPublisher.java 26 Nov 2008 09:10:54 -0000 1.34.2.8
@@ -12,6 +12,8 @@
import com.finalist.newsletter.services.NewsletterService;
import com.finalist.newsletter.util.NewsletterUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
@@ -58,11 +60,12 @@
String originalBody = "";
String status =
newsletterEditionNode.getStringValue("process_status");
String static_html =
newsletterEditionNode.getStringValue("static_html");
+ static_html = StringEscapeUtils.unescapeHtml(static_html);
if (EditionStatus.INITIAL.value().equals(status) &&
StringUtils.isEmpty(static_html)) {
originalBody = getBody(publication, subscription);
}
else {
- originalBody = newsletterEditionNode.getStringValue("static_html");
+ originalBody = static_html;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
