Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv20189/portlets-newsletter/src/java/com/finalist/newsletter/module
Modified Files:
ReportNewsletterSubscriptions.java
ReportSubscriberSubscriptions.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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ReportNewsletterSubscriptions.java 20 Jan 2008 22:48:35 -0000 1.2
+++ ReportNewsletterSubscriptions.java 21 Jan 2008 11:22:42 -0000 1.3
@@ -30,7 +30,7 @@
request.setAttribute("subscriberOverviewBeans", subscribers);
return (mapping.findForward("success"));
} else {
- errors.add("error", new ActionMessage("error.no_data"));
+ errors.add("error", new ActionMessage("error.no_items"));
}
}
saveErrors(request, errors);
Index: ReportSubscriberSubscriptions.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/module/ReportSubscriberSubscriptions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ReportSubscriberSubscriptions.java 17 Jan 2008 21:47:15 -0000 1.1
+++ ReportSubscriberSubscriptions.java 21 Jan 2008 11:22:42 -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;
@@ -12,6 +14,7 @@
import com.finalist.newsletter.module.bean.SubscriptionDetailBean;
import com.finalist.newsletter.util.BeanUtil;
+import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
public class ReportSubscriberSubscriptions extends Action {
@@ -23,6 +26,24 @@
if (userName != null) {
SubscriptionDetailBean bean =
BeanUtil.createSubscriptionDetailBean(userName);
if (bean != null) {
+ List<Integer> subscribedThemes =
NewsletterSubscriptionUtil.getUserSubscribedThemes(userName);
+ List<Integer> subscribedNewsletters =
NewsletterSubscriptionUtil.getUserSubscribedNewsletters(userName);
+
+ if (subscribedNewsletters != null && subscribedNewsletters.size()
> 0) {
+ request.setAttribute("newslettersubscriptions",
subscribedNewsletters);
+ }
+
+ if (subscribedThemes != null && subscribedThemes.size() > 0) {
+ request.setAttribute("themesubscriptions", subscribedThemes);
+ }
+
+ if ((subscribedThemes != null && subscribedThemes.size() > 0) ||
(subscribedNewsletters != null && subscribedNewsletters.size() > 0)) {
+ String status =
NewsletterSubscriptionUtil.getSubscriptionStatus(userName);
+
request.setAttribute(NewsletterSubscriptionUtil.SUBSCRIPTION_STATUS_KEY,
status);
+ String preferredMimeType =
NewsletterSubscriptionUtil.getPreferredMimeType(userName);
+
request.setAttribute(NewsletterSubscriptionUtil.PREFERRED_MIMETYPE,
preferredMimeType);
+ }
+
request.setAttribute("subscriptionDetailBean", bean);
return (mapping.findForward("success"));
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
