Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv18669/forms
Modified Files:
NewsletterCreate.java NewsletterDelete.java
NewsletterEdit.java NewsletterPublicationCreate.java
Log Message:
CMSC-811,Create a newsletter publication,adding default term, move from
NewsletterPublicationCreate to Newslettercreate
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-811
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterCreate.java 29 Nov 2007 10:20:56 -0000 1.4
+++ NewsletterCreate.java 6 May 2008 02:56:11 -0000 1.5
@@ -23,6 +23,7 @@
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.PagesUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterCreate extends MMBaseFormlessAction {
@@ -49,23 +50,10 @@
PagesUtil.linkPortlets(newNewsletter, layoutNode);
request.getSession().removeAttribute("parentnewsletter");
- // Create a default theme for this newsletter
- String newsletterTitle = "" +
newNewsletter.getStringValue("title");
- String newsletterDescription = "" +
newNewsletter.getStringValue("description");
-
- String themeTitle = newsletterTitle;
- String themeDescription = newsletterDescription;
- String themeShortDescription = newsletterDescription;
-
- NodeManager themeNodeManager =
cloud.getNodeManager("newslettertheme");
- Node themeNode = themeNodeManager.createNode();
-
- themeNode.setStringValue("title", themeTitle);
- themeNode.setStringValue("description", themeDescription);
- themeNode.setStringValue("shortdescription",
themeShortDescription);
- themeNode.commit();
+ // Create a default term for this newsletter
+
+ NewsletterPublicationUtil.createDefaultTerm(newNewsletter);
- RelationUtil.createRelation(newNewsletter, themeNode,
"defaulttheme");
addToRequest(request, "showpage", ewnodelastedited);
ActionForward ret = mapping.findForward(SUCCESS);
Index: NewsletterDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterDelete.java 4 Jan 2008 13:46:21 -0000 1.6
+++ NewsletterDelete.java 6 May 2008 02:56:11 -0000 1.7
@@ -45,9 +45,7 @@
}
int number = newsletterNode.getNumber();
- ;
- NewsletterUtil.deleteNewsletterThemesForNewsletter(number);
-
+ NewsletterUtil.deleteNewsletterTermsForNewsletter(number);
NavigationUtil.deleteItem(newsletterNode);
return mapping.findForward(SUCCESS);
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterEdit.java 21 Dec 2007 21:28:47 -0000 1.6
+++ NewsletterEdit.java 6 May 2008 02:56:11 -0000 1.7
@@ -40,16 +40,6 @@
SecurityUtil.clearUserRoles(cloud);
String ewnodelastedited = getParameter(request, "ewnodelastedited");
addToRequest(request, "showpage", ewnodelastedited);
-
- Node newsletterNode = cloud.getNode(ewnodelastedited);
- int defaultTheme =
NewsletterUtil.getDefaultTheme(Integer.valueOf(ewnodelastedited));
- Node defaultThemeNode = cloud.getNode(defaultTheme);
-
- defaultThemeNode.setStringValue("title",
newsletterNode.getStringValue("title"));
- defaultThemeNode.setStringValue("description",
newsletterNode.getStringValue("description"));
- defaultThemeNode.setStringValue("shortDescription",
newsletterNode.getStringValue("description"));
- defaultThemeNode.commit();
-
ActionForward ret = mapping.findForward(SUCCESS);
return ret;
}
Index: NewsletterPublicationCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterPublicationCreate.java 22 Apr 2008 03:44:12 -0000 1.13
+++ NewsletterPublicationCreate.java 6 May 2008 02:56:11 -0000 1.14
@@ -45,7 +45,6 @@
ret.setRedirect(true);
return ret;
}
-
String ewnodelastedited = getParameter(request, "ewnodelastedited");
addToRequest(request, "showpage", ewnodelastedited);
ActionForward ret = mapping.findForward("SUCCESS");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
