Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv4460/portlets-newsletter/src/java/com/finalist/newsletter/module
Modified Files:
ReportNewsletterSubscriptions.java
Log Message:
CMSC-632 Fixes to a lot of things
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-632
Index: ReportNewsletterSubscriptions.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/module/ReportNewsletterSubscriptions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ReportNewsletterSubscriptions.java 17 Jan 2008 21:47:15 -0000 1.1
+++ ReportNewsletterSubscriptions.java 20 Jan 2008 22:48:35 -0000 1.2
@@ -1,5 +1,7 @@
package com.finalist.newsletter.module;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -11,6 +13,7 @@
import org.apache.struts.action.ActionMessages;
import com.finalist.newsletter.module.bean.NewsletterDetailBean;
+import com.finalist.newsletter.module.bean.NewsletterSubscriberBean;
import com.finalist.newsletter.util.BeanUtil;
public class ReportNewsletterSubscriptions extends Action {
@@ -21,15 +24,11 @@
int newsletterNumber = Integer.parseInt(request.getParameter("number"));
if (newsletterNumber > 0) {
- NewsletterDetailBean bean =
BeanUtil.createNewsletterDetailBean(newsletterNumber);
- if (bean != null) {
- if (bean.getSubscribers() != null && bean.getSubscribers().size()
> 0) {
- request.setAttribute("newsletterDetailBean", bean);
+ request.setAttribute("number", newsletterNumber);
+ List<NewsletterSubscriberBean> subscribers =
BeanUtil.getSubscriberBeans(newsletterNumber);
+ if (subscribers != null && subscribers.size() > 0) {
+ request.setAttribute("subscriberOverviewBeans", subscribers);
return (mapping.findForward("success"));
-
- } else {
- errors.add("error", new ActionMessage("error.no_items"));
- }
} else {
errors.add("error", new ActionMessage("error.no_data"));
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
