Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv7519/java/com/finalist/newsletter/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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterCreate.java 22 Oct 2008 09:33:51 -0000 1.17
+++ NewsletterCreate.java 27 Oct 2008 05:56:30 -0000 1.18
@@ -57,16 +57,15 @@
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();
+ 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterEdit.java 22 Oct 2008 09:33:51 -0000 1.15
+++ NewsletterEdit.java 27 Oct 2008 05:56:30 -0000 1.16
@@ -58,9 +58,13 @@
Node newsletterNode = cloud.getNode(ewnodelastedited);
NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
- if(ServerUtil.isStaging()) {
+ Cloud remoteCloud = Publish.getRemoteCloud(cloud);
+
+
+ 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);
if (forwardType.equals("manage")) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
