From 6ac1deccf64e35de062ed960f84bd8a794d310d4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 16 Jul 2014 22:51:43 +0200
Subject: [FIX] mail, website_mail: specific mailing-list footer + better
 unsubscribe option

- remove the default footer for mail.group messages,
  replace with specific footer with archive and unsubscribe
  link
- remove the automatic addition of user signature in
  mail.group messages, as many of them will be posted
  via the mail gateway and already contain a user signature.
- make it easier to unsubscribe even when not logged in,
  as followers who have not signed up will have no
  way to login short of signing up.
- remove tests looking for user signature in mail.group posts
---
 addons/website_mail/static/src/js/follow.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'addons/website_mail/static')

diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js
index 18c36378328..a8b351efa6c 100644
--- a/addons/website_mail/static/src/js/follow.js
+++ b/addons/website_mail/static/src/js/follow.js
@@ -40,17 +40,21 @@
             }
             this.$target.removeClass('has-error');
 
-            openerp.jsonRpc('/website_mail/follow', 'call', {
-                'id': +this.$target.data('id'),
-                'object': this.$target.data('object'),
-                'message_is_follower': this.$target.attr("data-follow") || "off",
-                'email': $email.length ? $email.val() : false,
-            }).then(function (follow) {
-                self.toggle_subscription(follow, self.email);
-            });
+            var email = $email.length ? $email.val() : false;
+            if (email) {
+                openerp.jsonRpc('/website_mail/follow', 'call', {
+                    'id': +this.$target.data('id'),
+                    'object': this.$target.data('object'),
+                    'message_is_follower': this.$target.attr("data-follow") || "off",
+                    'email': email,
+                }).then(function (follow) {
+                    self.toggle_subscription(follow, email);
+                });
+            }
         },
         toggle_subscription: function(follow, email) {
             console.log(follow, email);
+            follow = follow || (!email && this.$target.attr('data-unsubscribe'));
             if (follow) {
                 this.$target.find(".js_follow_btn").addClass("hidden");
                 this.$target.find(".js_unfollow_btn").removeClass("hidden");
@@ -60,8 +64,8 @@
                 this.$target.find(".js_unfollow_btn").addClass("hidden");
             }
             this.$target.find('input.js_follow_email')
-                .val(email ? email : "")
-                .attr("disabled", follow || (email.length && this.is_user) ? "disabled" : false);
+                .val(email || "")
+                .attr("disabled", email && (follow || this.is_user) ? "disabled" : false);
             this.$target.attr("data-follow", follow ? 'on' : 'off');
         },
     });
-- 
cgit v1.2.3