Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv12648/forms
Modified Files:
NewsletterCreate.java NewsletterEdit.java
Log Message:
CMSC-1142 Newsletter: Add publication option to newsletters and newsletter
editions
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-1142
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- NewsletterCreate.java 27 Oct 2008 05:56:30 -0000 1.18
+++ NewsletterCreate.java 14 Nov 2008 10:11:23 -0000 1.19
@@ -18,8 +18,6 @@
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.PagesUtil;
-import com.finalist.cmsc.navigation.ServerUtil;
-import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.util.NewsletterUtil;
@@ -63,9 +61,9 @@
newNewsletter.setStringValue("scheduledescription",
NewsletterUtil.getScheduleMessageByExpression(
newNewsletter.getStringValue("schedule")));
newNewsletter.commit();
- if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
- Publish.publish(newNewsletter);
- }
+// if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
+// Publish.publish(newNewsletter);
+// }
addToRequest(request, "showpage", ewnodelastedited);
ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId="
+ ewnodelastedited + "&fresh=fresh");
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterEdit.java 28 Oct 2008 11:13:36 -0000 1.17
+++ NewsletterEdit.java 14 Nov 2008 10:11:23 -0000 1.18
@@ -18,9 +18,7 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.util.NewsletterUtil;
@@ -59,9 +57,9 @@
NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
- if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
- Publish.publish(newsletterNode);
- }
+// if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
+// Publish.publish(newsletterNode);
+// }
int nodeId = Integer.parseInt(request.getParameter("objectnumber"));
ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
