Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv19005/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
NewsletterSubscriptionPortlet.java
Log Message:
CMSC-708 move subscription portlet to new community adapter.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-708
Index: NewsletterSubscriptionPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- NewsletterSubscriptionPortlet.java 23 Apr 2008 10:32:05 -0000 1.23
+++ NewsletterSubscriptionPortlet.java 25 Apr 2008 18:18:34 -0000 1.24
@@ -1,30 +1,21 @@
package com.finalist.portlets.newsletter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.JspPortlet;
-import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.cmsc.services.community.person.Person;
import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.services.CommunityModuleAdapter;
import com.finalist.newsletter.services.NewsletterServiceFactory;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
-import
com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl;
import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
import com.finalist.newsletter.util.NewsletterUtil;
+import org.apache.pluto.core.impl.PortletConfigImpl;
+
+import javax.portlet.*;
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
public class NewsletterSubscriptionPortlet extends JspPortlet {
@@ -54,14 +45,19 @@
String[] newsletters = preferences.getValues(ALLOWED_NEWSLETTERS, null);
NewsletterSubscriptionServices services =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
- int userId = 842170;
- if(null==newsletters)
- {
+
+ Person currentUser = CommunityModuleAdapter.getCurrentUser();
+
+ if (null == currentUser) {
+ doInclude("view", "/fragment/pleaselogin.jsp", request, response);
+ }
+ else {
+ int userId = currentUser.getId().intValue();
+
+ if (null == newsletters) {
doInclude("view", "/fragment/null.jsp", request, response);
}
- else
- {
- if(services.hasSubscription(userId)){
+ else if (services.hasSubscription(userId)) {
List<Subscription> subscriptionList =
services.getSubscriptionList(newsletters, userId);
request.setAttribute("subscriptionList",
subscriptionList);
doInclude("view", "/fragment/list.jsp", request, response);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
