Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv9888/forms
Modified Files:
NewsletterCreate.java NewsletterEdit.java
Log Message:
CMSC-1085 Newsletter publication should be emailed from Live environment
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-1085
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterCreate.java 14 Oct 2008 11:22:43 -0000 1.16
+++ NewsletterCreate.java 22 Oct 2008 09:33:51 -0000 1.17
@@ -18,6 +18,8 @@
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;
@@ -55,12 +57,13 @@
Node layoutNode = PagesUtil.getLayout(newNewsletter);
PagesUtil.linkPortlets(newNewsletter, layoutNode);
request.getSession().removeAttribute("parentnewsletter");
-
+ if(ServerUtil.isStaging()) {
+ Publish.publish(newNewsletter);
+ }
// Create a default term for this newsletter
// NewsletterPublicationUtil.createDefaultTerm(newNewsletter);
NewsletterUtil.addScheduleForNewsletter(newNewsletter);
-
newNewsletter.setStringValue("scheduledescription",
NewsletterUtil.getScheduleMessageByExpression(
newNewsletter.getStringValue("schedule")));
newNewsletter.commit();
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterEdit.java 14 Oct 2008 11:22:43 -0000 1.14
+++ NewsletterEdit.java 22 Oct 2008 09:33:51 -0000 1.15
@@ -18,7 +18,9 @@
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;
@@ -56,7 +58,9 @@
Node newsletterNode = cloud.getNode(ewnodelastedited);
NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
-
+ if(ServerUtil.isStaging()) {
+ Publish.publish(newsletterNode);
+ }
int nodeId = Integer.parseInt(request.getParameter("objectnumber"));
ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
if (forwardType.equals("manage")) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
