Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv505
Modified Files:
Tag: b1_5
NewsletterEditionFreeze.java
Log Message:
CMSC-1178 Newsletter: add mechanism to use restrictions in the newsletter
edition workflow add code to check if it is in single mode
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-1178
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.4
retrieving revision 1.2.2.5
diff -u -b -r1.2.2.4 -r1.2.2.5
--- NewsletterEditionFreeze.java 20 Feb 2009 09:21:15 -0000 1.2.2.4
+++ NewsletterEditionFreeze.java 24 Feb 2009 03:37:36 -0000 1.2.2.5
@@ -7,14 +7,15 @@
import javax.servlet.http.HttpServletRequest;
import org.mmbase.bridge.Node;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.services.workflow.WorkflowException;
+import com.finalist.cmsc.util.ServerUtil;
import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
public class NewsletterEditionFreeze extends NewsletterEditionAction{
private static final String ERRORS = "errors";
@@ -23,6 +24,10 @@
@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 (Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
} else {
@@ -46,6 +51,7 @@
}
}
}
+ }
@Override
protected String getAction() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
