Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv25093/forms
Modified Files:
Tag: b1_5
NewsletterPublicationPublish.java
Log Message:
CMSC-1178 Newsletter: add mechanism to use restrictions in the newsletter
edition workflow
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: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- NewsletterPublicationPublish.java 10 Dec 2008 09:48:41 -0000 1.21.2.2
+++ NewsletterPublicationPublish.java 11 Dec 2008 06:56:43 -0000 1.21.2.3
@@ -75,8 +75,8 @@
return mapping.findForward("confirm_send");
}
}
- else
if("true".equalsIgnoreCase(PropertiesUtil.getProperty("newsletter.workflow.skip.approving")))
{
- if (EditionStatus.INITIAL.value().equals(process_status) ||
EditionStatus.APPROVED.value().equals(process_status)) {
+
if("true".equalsIgnoreCase(PropertiesUtil.getProperty("newsletter.workflow.skip.approving")))
{
+ if (EditionStatus.INITIAL.value().equals(process_status) ||
EditionStatus.FROZEN.value().equals(process_status)) {
request.setAttribute("message",
"confirm_send.skip.approving");
request.setAttribute("restriction", true);
return mapping.findForward("confirm_send");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
