Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv4902/src/java/com/finalist/newsletter/forms
Modified Files:
SubscriptioManagementAction.java
SubscriptionImportExportAction.java
Log Message:
cmsc-888 modify the code to make the import page could receive the param
correct after choosing wrong
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SubscriptioManagementAction.java 10 Jun 2008 03:46:40 -0000 1.6
+++ SubscriptioManagementAction.java 10 Jun 2008 09:45:23 -0000 1.7
@@ -181,10 +181,10 @@
HttpServletRequest request,
HttpServletResponse response) {
log.debug("Show import page");
String importType = (String)request.getParameter("importType");
- int newsletterId =
Integer.parseInt((String)request.getParameter("newsletterId"));
if(!StringUtil.isEmpty(importType)){
+ int newsletterId =
Integer.parseInt((String)request.getParameter("newsletterId"));
request.setAttribute("importType",importType);
- request.setAttribute("newsleterId", newsletterId);
+ request.setAttribute("newsletterId", newsletterId);
}
return mapping.findForward("importpage");
Index: SubscriptionImportExportAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptionImportExportAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SubscriptionImportExportAction.java 10 Jun 2008 03:46:40 -0000 1.5
+++ SubscriptionImportExportAction.java 10 Jun 2008 09:45:23 -0000 1.6
@@ -9,7 +9,6 @@
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import com.finalist.newsletter.services.NewsletterService;
import com.finalist.cmsc.services.community.security.Authentication;
-import com.finalist.cmsc.services.community.security.AuthenticationService;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.commons.logging.Log;
@@ -24,7 +23,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
@@ -32,8 +30,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
-import java.util.StringTokenizer;
-
public class SubscriptionImportExportAction extends DispatchActionSupport {
private static Log log =
LogFactory.getLog(SubscriptionImportExportAction.class);
@@ -122,6 +118,7 @@
public ActionForward importUserSubScription(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response) throws FileNotFoundException, IOException{
SubscriptionImportUploadForm myForm = (SubscriptionImportUploadForm) form;
+ ActionMessages messages = new ActionMessages();
FormFile myFile = myForm.getDatafile();
boolean isCSV = myFile.getFileName().toLowerCase().endsWith(".csv");
int tmpNewsletterId =
Integer.parseInt((String)request.getParameter("newsletterId"));
@@ -155,6 +152,10 @@
return mapping.findForward("success");
}
else{
+ request.setAttribute("importType", "importCSV");
+ request.setAttribute("newsletterId", tmpNewsletterId);
+ messages.add("file", new ActionMessage("datafile.unsupport"));
+ saveMessages(request, messages);
return mapping.findForward("failed");
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
