[FIX] website snippet: clean_for_save; display email in subscribe snippet

bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24

2 files changed, 7 insertions, 8 deletions

diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index c67f0eba2b8..bef6eedfef4 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -31,6 +31,9 @@
             this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
             this._super();
         },
+        clean_for_save: function () {
+            this.$target.addClass("hidden");
+        },
     });
 })();
 
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 15f7e4381a0..e72cf0bc9b6 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -12,15 +12,11 @@
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
             }).always(function (data) {
-
-                var $input = self.$target.find('input.js_follow_email');
-                if(data.is_public) {
-                    $input.removeClass("hidden");
-                } else {
-                    $input.addClass("hidden");
-                }
-
+                self.$target.find('input.js_follow_email')
+                    .val(data.email ? data.email : "")
+                    .attr("disabled", data.email.length ? "disabled" : false);
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
+                self.$target.removeClass("hidden");
             });
         },
     });