Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv12721/forms
Modified Files:
Tag: b1_5
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.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- NewsletterCreate.java 24 Sep 2008 09:56:25 -0000 1.15
+++ NewsletterCreate.java 14 Nov 2008 10:12:48 -0000 1.15.2.1
@@ -25,7 +25,6 @@
* Create Newsletter Action
*
* @author Lisa
- *
*/
public class NewsletterCreate extends MMBaseFormlessAction {
/**
@@ -57,14 +56,14 @@
PagesUtil.linkPortlets(newNewsletter, layoutNode);
request.getSession().removeAttribute("parentnewsletter");
- // 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.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- NewsletterEdit.java 23 Sep 2008 10:07:29 -0000 1.13
+++ NewsletterEdit.java 14 Nov 2008 10:12:48 -0000 1.13.2.1
@@ -26,7 +26,6 @@
* Newsletter Edit Action
*
* @author Lisa
- *
*/
public class NewsletterEdit extends MMBaseFormlessAction {
@@ -58,6 +57,10 @@
NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
+// 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
