Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv18248/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterCreate.java NewsletterEdit.java
Added Files:
ScheduleAction.java
Removed Files:
Schedule.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
ScheduleAction.java is new
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterCreate.java 10 May 2008 16:32:16 -0000 1.6
+++ NewsletterCreate.java 28 May 2008 11:06:55 -0000 1.7
@@ -24,6 +24,7 @@
import com.finalist.cmsc.navigation.PagesUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
+import com.finalist.newsletter.util.NewsletterUtil;
public class NewsletterCreate extends MMBaseFormlessAction {
@@ -53,8 +54,10 @@
// Create a default term for this newsletter
NewsletterPublicationUtil.createDefaultTerm(newNewsletter);
+ NewsletterUtil.addScheduleForNewsletter(newNewsletter);
-
+
newNewsletter.setStringValue("scheduledescription",NewsletterUtil.getScheduleMessageByExpression(newsletterNode.getStringValue("schedule")));
+ newNewsletter.commit();
addToRequest(request, "showpage", ewnodelastedited);
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NewsletterEdit.java 10 May 2008 16:32:16 -0000 1.8
+++ NewsletterEdit.java 28 May 2008 11:06:55 -0000 1.9
@@ -31,15 +31,18 @@
if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
-
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ mapping.findForward("returnurl").getPath());
ret.setRedirect(true);
return ret;
} else {
SecurityUtil.clearUserRoles(cloud);
+
String ewnodelastedited = getParameter(request, "ewnodelastedited");
+ Node newsletterNode = cloud.getNode(ewnodelastedited);
+ NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
+
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
