[Openuss-svn-commits] SF.net SVN: openuss:[4828] branches/openuss-plexus-3.1/plexus/plexus-web/ src/main

[<id...@us...>]

Revision: 4828
          http://openuss.svn.sourceforge.net/openuss/?rev=4828&view=rev
Author:   idueppe
Date:     2008-10-08 15:23:32 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
fixed newsletter subscribe unsubscribe issue

Modified Paths:
--------------
    branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/mail/NewsletterMainPage.java
    branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/sidebar/newsletteroptions.xhtml

Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/mail/NewsletterMainPage.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/mail/NewsletterMainPage.java	2008-10-08 06:10:19 UTC (rev 4827)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/java/org/openuss/web/mail/NewsletterMainPage.java	2008-10-08 15:23:32 UTC (rev 4828)
@@ -3,6 +3,8 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.faces.event.ActionEvent;
+
 import org.apache.shale.tiger.managed.Bean;
 import org.apache.shale.tiger.managed.Scope;
 import org.apache.shale.tiger.view.Prerender;
@@ -72,15 +74,14 @@
 		return Constants.NEWSLETTER_NEWMAIL;
 	}
 	
-	public String toggleNewsletterStatus(){
+	public void toggleNewsletterStatus(ActionEvent action){
 		if (getNewsletter().isSubscribed()){
 			getCourseNewsletterService().unsubscribe(courseInfo, user);	
 			addMessage(i18n("newsletter_unsubscribe_success"));
-		} else if (!getNewsletter().isSubscribed()){
+		} else {
 			getCourseNewsletterService().subscribe(courseInfo, user);
 			addMessage(i18n("newsletter_subscribe_success"));
 		}
-		return Constants.SUCCESS;
 	}
 	
 	public String sendMail(){

Modified: branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/sidebar/newsletteroptions.xhtml
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/sidebar/newsletteroptions.xhtml	2008-10-08 06:10:19 UTC (rev 4827)
+++ branches/openuss-plexus-3.1/plexus/plexus-web/src/main/webapp/views/commons/sidebar/newsletteroptions.xhtml	2008-10-08 15:23:32 UTC (rev 4828)
@@ -12,6 +12,7 @@
     xmlns:x="http://myfaces.apache.org/extensions">
 	
 		<h:form>
+			<t:saveState id="newsletter_abo" value="#{newsletter_newsletter.subscribed}"/>
 			<s:acl domainObject="#{courseInfo}" hasPermission="#{ACL.PARTICIPATE}">
 				<o:block label="#{msg.user_options_sidebar_header}" styleClass="option_box">
 					<h:outputText value="#{msg['newsletter_subscribe']}" styleClass="content_font_normal" rendered="#{not newsletter_newsletter.subscribed}" escape="false"></h:outputText>
@@ -19,12 +20,12 @@
 					<ul class="action_list">
 						<c:if test="#{not newsletter_newsletter.subscribed}">
 							<li class="newsletter_subscribe">
-								<h:commandLink value="" action="#{views$secured$newsletter$newsletter.toggleNewsletterStatus}" ><span />#{msg['newsletter_button_subscribe']}</h:commandLink>
+								<h:commandLink value="" actionListener="#{views$secured$newsletter$newsletter.toggleNewsletterStatus}" ><span />#{msg['newsletter_button_subscribe']}</h:commandLink>
 							</li>
 						</c:if>
 						<c:if test="#{newsletter_newsletter.subscribed}">
 							<li class="newsletter_unsubscribe">
-								<h:commandLink value="" action="#{views$secured$newsletter$newsletter.toggleNewsletterStatus}" ><span />#{msg['newsletter_button_unsubscribe']}</h:commandLink>
+								<h:commandLink value="" actionListener="#{views$secured$newsletter$newsletter.toggleNewsletterStatus}" ><span />#{msg['newsletter_button_unsubscribe']}</h:commandLink>
 							</li>
 						</c:if>
 						


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.