diff options
| author | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-21 13:03:01 +0530 |
|---|---|---|
| committer | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-21 13:03:01 +0530 |
| commit | 8bb5bfa241df9bcfa5a9bf3dbad4eaab59d54fec (patch) | |
| tree | b78959d4806327445b6b77181749be2301fe13dd /addons/website_mail/static/src | |
| parent | 9f51a6d45353f3a1c87a3a95eaf29476b61fd4a6 (diff) | |
| parent | 54d8cd1e866d1a6dc0b594588a6d900d6404728c (diff) | |
[MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140320063836-xzno2dwuaxt1y033
bzr revid: dizzy.zala@gmail.com-20140321073301-hvfqqnch7jfktinb
Diffstat (limited to 'addons/website_mail/static/src')
| -rw-r--r-- | addons/website_mail/static/src/css/website_mail.css | 1 | ||||
| -rw-r--r-- | addons/website_mail/static/src/js/website_mail.js | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css index 25d88ebf191..5678442416c 100644 --- a/addons/website_mail/static/src/css/website_mail.css +++ b/addons/website_mail/static/src/css/website_mail.css @@ -1,5 +1,4 @@ .js_follow[data-follow='on'] .js_follow_btn , -.js_follow[data-follow='on'] .js_follow_email, .js_follow[data-follow='off'] .js_unfollow_btn { display: none; }
\ No newline at end of file diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js index 672a21324a8..bd34b526ddd 100644 --- a/addons/website_mail/static/src/js/website_mail.js +++ b/addons/website_mail/static/src/js/website_mail.js @@ -9,13 +9,14 @@ var self = this; // set value and display button - openerp.jsonRpc('/website_mail/is_follower/', 'call', { + self.$target.find("input").removeClass("hidden"); + openerp.jsonRpc('/website_mail/is_follower', 'call', { model: this.$target.data('object'), id: +this.$target.data('id'), }).always(function (data) { self.$target.find('input.js_follow_email') .val(data.email ? data.email : "") - .attr("disabled", data.email.length ? "disabled" : false); + .attr("disabled", data.is_follower && data.email.length ? "disabled" : false); self.$target.attr("data-follow", data.is_follower ? 'on' : 'off'); self.$target.removeClass("hidden"); }); @@ -47,8 +48,10 @@ 'email': $email.length ? $email.val() : false, }).then(function (follow) { if (follow) { - self.$target.find(" > *").toggleClass("hidden"); + self.$target.find(".js_follow_email, .input-group-btn").addClass("hidden"); + self.$target.find(".alert").removeClass("hidden"); } + self.$target.find('input.js_follow_email').attr("disabled", follow ? "disabled" : false); self.$target.attr("data-follow", follow ? 'on' : 'off'); }); }, |