[MERGE] Forward-port saas-4 up to bf135ad

5 files changed, 1 insertions, 169 deletions

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index de69fba490a..c0592000208 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -81,6 +81,7 @@ class WebsiteMail(http.Controller):
             'is_user': uid != public_id,
             'email': email,
             'is_follower': False,
+            'alias_name': False,
         }
 
         if not obj:
@@ -95,8 +96,5 @@ class WebsiteMail(http.Controller):
                             ('res_id', '=', obj_ids[0]),
                             ('partner_id', '=', partner_id.id)
                         ], context=context)) == 1
-            if post.get('fields'):
-                record = obj.read(cr, SUPERUSER_ID, obj_ids[0], fields=post.get('fields'), context=context)
-                values.update(record)
 
         return values
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
deleted file mode 100644
index 7a26920682b..00000000000
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-    var _t = openerp._t;
-
-    website.snippet.options.subscribe = website.snippet.Option.extend({
-        on_prompt: function () {
-            var self = this;
-            return website.prompt({
-                id: "editor_new_subscribe_button",
-                window_title: _t("Add a Subscribe Button"),
-                select: _t("Mailing List"),
-                init: function (field) {
-                    return website.session.model('mail.group')
-                            .call('name_search', ['', [['public','=','public']]], { context: website.get_context() });
-                },
-            }).then(function (mail_group_id) {
-                self.$target.attr("data-id", mail_group_id);
-            });
-        },
-        drop_and_build_snippet: function() {
-            var self = this;
-            this._super();
-            this.on_prompt().fail(function () {
-                self.editor.on_remove();
-            });
-        },
-        start : function () {
-            var self = this;
-            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
deleted file mode 100644
index d069f88ea45..00000000000
--- a/addons/website_mail/static/src/js/website_mail.js
+++ /dev/null
@@ -1,77 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-
-    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
-        selector: ".js_follow",
-        start: function (editable_mode) {
-            var self = this;
-            this.is_user = false;
-
-            openerp.jsonRpc('/website_mail/is_follower', 'call', {
-                model: this.$target.data('object'),
-                id: this.$target.data('id'),
-                fields: ['name', 'alias_id'],
-            }).always(function (data) {
-                self.is_user = data.is_user;
-                self.$target.find('.js_mg_email').attr('href', 'mailto:' + data.alias_id[1]);
-                self.$target.find('.js_mg_link').attr('href', '/groups/' + data.id);
-                self.toggle_subscription(data.is_follower);
-                self.$target.find('input.js_follow_email')
-                    .val(data.email ? data.email : "")
-                    .attr("disabled", data.is_follower || (data.email.length && self.is_user) ? "disabled" : false);
-                self.$target.removeClass("hidden");
-            });
-
-            // not if editable mode to allow designer to edit alert field
-            if (!editable_mode) {
-                $('.js_follow > .alert').addClass("hidden");
-                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
-                this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
-                    event.preventDefault();
-                    self.on_click();
-                });
-            }
-            return;
-        },
-        on_click: function () {
-            var self = this;
-            var $email = this.$target.find(".js_follow_email");
-
-            if ($email.length && !$email.val().match(/.+@.+/)) {
-                this.$target.addClass('has-error');
-                return false;
-            }
-            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);
-            });
-        },
-        toggle_subscription: function(follow) {
-            if (follow) {
-                this.$target.find(".js_mg_follow_form").addClass("hidden");
-                this.$target.find(".js_mg_details").removeClass("hidden");
-            }
-            else {
-                this.$target.find(".js_mg_follow_form").removeClass("hidden");
-                this.$target.find(".js_mg_details").addClass("hidden");
-            }
-            this.$target.find('input.js_follow_email').attr("disabled", follow || this.is_user ? "disabled" : false);
-            this.$target.attr("data-follow", follow ? 'on' : 'off');
-        },
-    });
-
-    $(document).ready(function () {
-        $('.js_follow_btn').on('click', function (ev) {
-            var email = $(ev.currentTarget).parents('.js_mg_follow_form').first().find('.js_follow_email').val();
-            $(document).find('.js_follow_email').val(email);
-        });
-    });
-})();
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 987ccaa672e..ebbcf6d4a70 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -493,53 +493,5 @@
 
 </template>
 
-
-<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe">
-
-    <xpath expr="//div[@id='snippet_content']" position="inside">
-        <div>
-            <div class="oe_snippet_thumbnail">
-                <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
-                <span class="oe_snippet_thumbnail_title">Subscribe Button</span>
-            </div>
-
-            <div class="oe_snippet_body js_follow"
-                      data-id="0"
-                      data-object="mail.group"
-                      data-follow="off">
-                <div class="input-group js_mg_follow_form">
-                    <input
-                          type="email"
-                          name="email"
-                          class="js_follow_email form-control"
-                          placeholder="your email..."/>
-                    <span class="input-group-btn">
-                        <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
-                    </span>
-                </div>
-                <p class="js_mg_details hidden well well-sm">
-                    <i class="fa fa-envelope-o"/><a href="#" class="js_mg_email"> send mail</a> -
-                    <i class="fa fa-file-o"/><a href="#" class="js_mg_link"> archives</a> -
-                    <i class="fa fa-times"/><a href="#" class="js_unfollow_btn"> unsubscribe</a>
-                </p>
-            </div>
-
-        </div>
-    </xpath>
-
-
-    <xpath expr="//div[@id='snippet_options']" position="inside">
-        <div data-snippet-option-id='subscribe'
-            data-selector=".js_follow"
-            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-           >
-            <li>
-                <a href="#" class="button js_mailing_list">Change mailing list</a>
-            </li>
-        </div>
-    </xpath>
-
-</template>
-
 </data>
 </openerp>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 5d384f5c0b0..367bf352d64 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -21,7 +21,6 @@
 
 <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
     <xpath expr="/t" position="inside">
-        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>