Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv18058/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterTermsAddAction.java SubscriptioManagementAction.java
Log Message:
CMSC-956 chang all subscriber to show correct data.
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-956
Index: NewsletterTermsAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermsAddAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterTermsAddAction.java 24 Jul 2008 09:04:16 -0000 1.1
+++ NewsletterTermsAddAction.java 5 Aug 2008 05:47:14 -0000 1.2
@@ -5,7 +5,6 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.bridge.RelationUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
@@ -13,6 +12,7 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
public class NewsletterTermsAddAction extends MMBaseFormlessAction {
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- SubscriptioManagementAction.java 25 Jul 2008 15:53:09 -0000 1.9
+++ SubscriptioManagementAction.java 5 Aug 2008 05:47:14 -0000 1.10
@@ -130,13 +130,13 @@
Map result = new HashMap();
Subscription subscription = subscription1;
result.put("id", subscription.getId());
- result.put("status",subscription.getStatus().toString());
-
result.put("newsletter",newsletterService.getNewsletterBySubscription(subscription.getId()).getTitle());
- Person tmpPerson
=personServices.getPersonByEmail(subscription.getSubscriber().getEmail());
- if(tmpPerson.getFirstName() != null) {
+ result.put("status",
subscription.getStatus().toString());
+ result.put("newsletter",
newsletterService.getNewsletterBySubscription(subscription.getId()).getTitle());
+ Person tmpPerson =
personServices.getPersonByEmail(subscription.getSubscriber().getEmail());
+ if (tmpPerson.getFirstName() != null) {
result.put("username", tmpPerson.getFirstName());
}
- if(tmpPerson.getLastName() != null) {
+ if (tmpPerson.getLastName() != null) {
result.put("fullname", tmpPerson.getFirstName() + " " +
tmpPerson.getLastName());
}
result.put("email", subscription.getSubscriber().getEmail());
@@ -180,12 +180,12 @@
persons = subscriptionServices.getAllSubscribers(name, email);
}
else {
- persons = subscriptionServices.getAllSubscribers();
+ persons = subscriptionServices.getAllSubscribers("",
"");
}
-
+ if (persons != null) {
List results = convertPersonsToMap(persons);
-
request.setAttribute("results", results);
+ }
return mapping.findForward("listsubscribers");
}
@@ -193,9 +193,9 @@
HttpServletRequest request,
HttpServletResponse response) {
log.debug("Show import page");
String importType = request.getParameter("importType");
- if(StringUtils.isNotEmpty(importType)){
+ if (StringUtils.isNotEmpty(importType)) {
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- request.setAttribute("importType",importType);
+ request.setAttribute("importType", importType);
request.setAttribute("newsletterId", newsletterId);
}
return mapping.findForward("importpage");
@@ -205,11 +205,11 @@
public ActionForward unsubscribe(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response) {
String[] newsletterIds = request.getParameterValues("ids");
- for(String id :newsletterIds){
+ for (String id : newsletterIds) {
subscriptionServices.unSubscribeAllInNewsletter(Integer.decode(id));
}
- return newsletterOverview(mapping,form,request, response);
+ return newsletterOverview(mapping, form, request, response);
}
private List<Map> convertPersonsToMap(List<Person> persons) {
@@ -220,7 +220,7 @@
result.put("id", person.getId());
result.put("username", person.getNickname());
result.put("email", person.getEmail());
- result.put("fullname", person.getLastName() + " " +
person.getFirstName());
+ result.put("fullname", person.getFirstName() + " " +
person.getLastName());
results.add(result);
}
return results;
@@ -261,7 +261,4 @@
return results;
}
-
-
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
