Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv18987/forms
Modified Files:
Tag: b1_5
NewsletterEditionFreeze.java
Log Message:
CMSC-1180 Newsletter: change newsletter schedule mechanism remove the datetime
when publishing a edtion
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1180
Index: NewsletterEditionFreeze.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- NewsletterEditionFreeze.java 24 Feb 2009 03:37:36 -0000 1.2.2.5
+++ NewsletterEditionFreeze.java 25 Feb 2009 02:48:32 -0000 1.2.2.6
@@ -24,10 +24,8 @@
@Override
protected void doSave(HttpServletRequest request, Node edition) throws
Exception {
if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
- if(ServerUtil.isSingle()) {
- NewsletterPublicationUtil.freezeEdition(edition);
- }
- else {
+ if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
+
if (Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
} else {
@@ -50,6 +48,9 @@
request.getSession().setAttribute(NEEDAJAX,
edition.getNumber());
}
}
+ else {
+ NewsletterPublicationUtil.freezeEdition(edition);
+ }
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
