Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv16354/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterDelete.java NewsletterEdit.java
NewsletterPublicationCreate.java
NewsletterPublicationDelete.java
NewsletterPublicationEdit.java
SubscriptioManagementAction.java
Added Files:
NewsletterPublicationManageForm.java
NewsletterPublicationManagementAction.java
NewsletterSubscriberSearchAction.java
NewsletterSubscriberSearchForm.java
NewsletterTermSearchAction.java
Log Message:
cmsc-956 finish, change dashboard of newsleter management
cmsc-979 not finish yet. finish page design, edit part. logic of statistics
need more discuss
cmsc-990 not finish yet. finish page design. logic of subscriber need more
discuss.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
NewsletterPublicationManageForm.java is new
NewsletterPublicationManagementAction.java is new
NewsletterSubscriberSearchAction.java is new
NewsletterSubscriberSearchForm.java is new
NewsletterTermSearchAction.java is new
Index: NewsletterDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterDelete.java 20 May 2008 05:29:00 -0000 1.9
+++ NewsletterDelete.java 7 Jul 2008 04:03:43 -0000 1.10
@@ -11,6 +11,8 @@
import javax.servlet.http.HttpServletRequest;
+import net.sf.mmapps.commons.util.StringUtil;
+
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
@@ -50,8 +52,13 @@
int number = newsletterNode.getNumber();
NewsletterUtil.deleteRelatedElement(number);
+ NewsletterUtil.deleteNewsletterTermsForNewsletter(newsletterNode);
+ NewsletterUtil.deleteSubscriptionByTerm(newsletterNode);
NavigationUtil.deleteItem(newsletterNode);
+ if(!StringUtil.isEmpty(getParameter(request,"forward"))){
+ return mapping.findForward("newslettermanage");
+ }
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterEdit.java 28 May 2008 11:06:55 -0000 1.9
+++ NewsletterEdit.java 7 Jul 2008 04:03:43 -0000 1.10
@@ -9,6 +9,9 @@
*/
package com.finalist.newsletter.forms;
+import java.net.URL;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
@@ -28,11 +31,12 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
String action = getParameter(request, "action");
+ String forwardType = getParameter(request,"forward");
if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
- + mapping.findForward("returnurl").getPath());
+ + mapping.findForward("returnurl").getPath() +
URLEncoder.encode( "?forward") + "=" + forwardType + URLEncoder.encode(
"&objectnumber") + "=" + objectnumber);
ret.setRedirect(true);
return ret;
} else {
@@ -43,7 +47,11 @@
NewsletterUtil.addScheduleForNewsletter(newsletterNode);
addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
+ int nodeId =Integer.parseInt(request.getParameter("objectnumber"));
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
+ if(forwardType.equals("manage")){
+ ret = mapping.findForward("newslettermanage");
+ }
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NewsletterPublicationCreate.java 10 May 2008 16:32:16 -0000 1.15
+++ NewsletterPublicationCreate.java 7 Jul 2008 04:03:43 -0000 1.16
@@ -9,6 +9,8 @@
*/
package com.finalist.newsletter.forms;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
@@ -28,6 +30,7 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
String action = request.getParameter("action");
+ String forwardType = request.getParameter("forward");
if (StringUtils.isBlank(action)) { // Initialize the new
int parent = Integer.parseInt(getParameter(request, "parent", true));
@@ -40,14 +43,25 @@
String objectnumber = String.valueOf(publicationNode.getNumber());
request.getSession().removeAttribute("parent");
- ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ ActionForward ret = null;
+ if(StringUtils.isNotEmpty(forwardType)){
+ ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ + mapping.findForward("publicationmanage").getPath() +
URLEncoder.encode("?forward") + "=" + forwardType +
URLEncoder.encode("&newsletterId") + "=" + parent);
+ }
+ else{
+ ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
+ mapping.findForward("returnurl").getPath());
+ }
ret.setRedirect(true);
return ret;
}
String ewnodelastedited = getParameter(request, "ewnodelastedited");
addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = mapping.findForward("SUCCESS");
+ ActionForward ret;
+ if(StringUtils.isNotEmpty(forwardType)){
+ ret = new
ActionForward(mapping.findForward("publicationmanage").getPath() +
"?newsletterId=" + request.getParameter("newsletterId"));
+ }
+ ret = mapping.findForward("SUCCESS");
return ret;
}
}
Index: NewsletterPublicationDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationDelete.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationDelete.java 8 Jan 2008 10:45:00 -0000 1.5
+++ NewsletterPublicationDelete.java 7 Jul 2008 04:03:43 -0000 1.6
@@ -15,6 +15,7 @@
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import org.apache.commons.lang.StringUtils;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.security.SecurityUtil;
@@ -22,6 +23,7 @@
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
+
public class NewsletterPublicationDelete extends MMBaseFormlessAction {
/** name of submit button in jsp to confirm removal */
@@ -32,6 +34,8 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ String forwardType = getParameter(request, "forward");
+ String parent = getParameter(request, "parent");
if (isRemoveAction(request)) {
int objectnumber = Integer.parseInt(getParameter(request, "number",
true));
@@ -44,14 +48,16 @@
return mapping.findForward("newsletterpublicationdeletewarning");
}
NewsletterPublicationUtil.deletePublication(objectnumber);
- return mapping.findForward(SUCCESS);
+ return actionReturn(mapping,request, forwardType, parent);
}
if (isCancelAction(request)) {
- return mapping.findForward(SUCCESS);
+ return actionReturn(mapping,request, forwardType, parent);
}
// neither remove or cancel, show confirmation page
+ request.setAttribute("forward", forwardType);
+ request.setAttribute("parent", parent);
return mapping.findForward("newsletterpublicationdelete");
}
@@ -63,4 +69,16 @@
return getParameter(request, ACTION_REMOVE) != null;
}
+ protected ActionForward actionReturn(ActionMapping mapping,
HttpServletRequest request, String forwardType, String parent){
+ ActionForward ret = null;
+ if (StringUtils.isNotEmpty(forwardType)){
+ ret =new
ActionForward(mapping.findForward("publicationmanage").getPath() +
"?newsletterId=" + parent);
+ request.setAttribute("newsletterId", parent);
+ }
+ else{
+ ret = mapping.findForward(SUCCESS);
+ }
+ return ret;
+ }
+
}
Index: NewsletterPublicationEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationEdit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationEdit.java 10 May 2008 16:32:16 -0000 1.4
+++ NewsletterPublicationEdit.java 7 Jul 2008 04:03:43 -0000 1.5
@@ -9,6 +9,8 @@
*/
package com.finalist.newsletter.forms;
+import java.net.URLEncoder;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
@@ -26,19 +28,27 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
String action = getParameter(request, "action");
+ String forwardType = getParameter(request ,"forward");
+ String parent = getParameter(request, "parent");
if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
- + mapping.findForward("returnurl").getPath());
+ + mapping.findForward("returnurl").getPath() +
URLEncoder.encode("?forward=") + forwardType + URLEncoder.encode("&number=") +
objectnumber + URLEncoder.encode("&parent=" + parent));
ret.setRedirect(true);
return ret;
} else {
SecurityUtil.clearUserRoles(cloud);
String ewnodelastedited = getParameter(request, "ewnodelastedited");
addToRequest(request, "showpage", ewnodelastedited);
- ActionForward ret = mapping.findForward(SUCCESS);
+ ActionForward ret = null;
+ if(StringUtils.isNotEmpty(forwardType)){
+ ret = new
ActionForward(mapping.findForward("publicationmanage").getPath() +
"?newsletterId=" + parent);
+ }
+ else{
+ ret = mapping.findForward(SUCCESS);
+ }
return ret;
}
}
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- SubscriptioManagementAction.java 10 Jun 2008 09:45:23 -0000 1.7
+++ SubscriptioManagementAction.java 7 Jul 2008 04:03:43 -0000 1.8
@@ -41,6 +41,17 @@
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
log.debug("No parameter specified,go to dashboard");
+ List<Newsletter> newsletters;
+
+ String title = request.getParameter("title");
+ String subscriber = request.getParameter("subscriber");
+
+ newsletters = newsletterService.getNewsletters(subscriber, title);
+
+ List<Map> results = convertToMap(newsletters);
+
+ request.setAttribute("results", results);
+
request.setAttribute("newslettercount",
newsletterService.countAllNewsletters());
request.setAttribute("termcount", newsletterService.countAllTerms());
request.setAttribute("subscriptioncount",
subscriptionServices.countAllSubscriptions());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
