Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv7202
Modified Files:
services.jsp
Log Message:
CMSC-818
modify servies.jsp
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-818
Index: services.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/services.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- services.jsp 25 Apr 2008 18:18:34 -0000 1.4
+++ services.jsp 28 Apr 2008 05:54:51 -0000 1.5
@@ -4,17 +4,15 @@
<[EMAIL PROTECTED] import="java.util.*"%>
<%@ page import="java.text.SimpleDateFormat"%>
<%@ page import="com.finalist.newsletter.services.CommunityModuleAdapter" %>
-good!
<%
NewsletterSubscriptionServices service =
NewsletterServiceFactory.getNewsletterSubscriptionServices();
int userId = CommunityModuleAdapter.getCurrentUser().getId().intValue();
int newsletterId = 0;
int tagId = 0;
boolean hasSelect = false;
- String status = "unSubscription";
+ String status = "INACTIVE";
String format = "html";
String action = null;
- //Date pausedate = null;
if(null!=request.getParameter("action"))
{
@@ -40,21 +38,16 @@
{
status = request.getParameter("status");
}
- //if(null!=request.getParameter("pausedate"))
- //{
- // String pausedateString = request.getParameter("pausedate");
- // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- // pausedate = dateFormat.parse(pausedateString);
- //}
- //add newrecord
+
if(service.noSubscriptionRecord(userId,newsletterId))
{
service.addNewRecord(userId,newsletterId);
- }else
+ }
+
+
// modify status
if("modifyStatus".equals(action))
{
- System.out.println("modifyStatus="+status);
if("ACTIVE".equals(status))
{
if(hasSelect){
@@ -77,23 +70,18 @@
//modify format
if("modifyFormat".equals(action))
{
- System.out.println("modifyFormat");
service.modifyFormat(userId,newsletterId,format);
}
//select tag
if("modifyTag".equals(action))
{
- System.out.println("modifyTag");
if(hasSelect){
- System.out.println("select");
service.selectTagInLetter(userId,newsletterId,tagId);
}
else{
- System.out.println("unselect");
service.unSelectTagInLetter(userId,newsletterId,tagId);
}
}
-
%>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
