Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv11337/java/com/finalist/newsletter/forms
Modified Files:
NewsletterEditionDefrost.java NewsletterEditionFreeze.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1146
Index: NewsletterEditionDefrost.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionDefrost.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterEditionDefrost.java 13 Nov 2008 08:35:11 -0000 1.1
+++ NewsletterEditionDefrost.java 13 Nov 2008 09:34:49 -0000 1.2
@@ -9,6 +9,7 @@
import org.mmbase.bridge.Node;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterEditionDefrost extends MMBaseFormlessAction{
@@ -28,7 +29,15 @@
if(isSaveAction(request)) {
Node edition = cloud.getNode(number);
request.setAttribute("action", "defrost");
+
if(!EditionStatus.INITIAL.value().equals(edition.getValue("process_status"))) {
NewsletterPublicationUtil.defrostEdition(edition);
+ }
+ if (StringUtils.isNotBlank(request.getParameter("forward"))) {
+ ActionForward ret = new
ActionForward(mapping.findForward("publicationedit").getPath() +
"?newsletterId="
+ + request.getParameter("newsletterId"));
+ ret.setRedirect(true);
+ return ret;
+ }
return mapping.findForward(SUCCESS_FORWARD);
}
if(isCancelAction(request)) {
Index: NewsletterEditionFreeze.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterEditionFreeze.java 13 Nov 2008 08:35:11 -0000 1.1
+++ NewsletterEditionFreeze.java 13 Nov 2008 09:34:49 -0000 1.2
@@ -9,6 +9,7 @@
import org.mmbase.bridge.Node;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterEditionFreeze extends MMBaseFormlessAction{
@@ -25,7 +26,15 @@
if(isSaveAction(request)) {
Node edition = cloud.getNode(number);
request.setAttribute("action", "freeze");
+
if(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
NewsletterPublicationUtil.freezeEdition(edition);
+ }
+ if (StringUtils.isNotBlank(request.getParameter("forward"))) {
+ ActionForward ret = new
ActionForward(mapping.findForward("publicationedit").getPath() +
"?newsletterId="
+ + request.getParameter("newsletterId"));
+ ret.setRedirect(true);
+ return ret;
+ }
return mapping.findForward("success");
}
if(isCancelAction(request)) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
