From 8c91d690f00d209450fba94be8a0a2116d8043c1 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 17 Aug 2016 09:47:13 +0200 Subject: [PATCH] [FIX] mail: Don't display follower settings (fa-cog) if not follower on the record Y --- addons/mail/static/src/js/followers.js | 2 ++ addons/mail/static/src/less/followers.less | 5 +++++ addons/mail/static/src/xml/followers.xml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/followers.js b/addons/mail/static/src/js/followers.js index acc20b1ffc0..fbe27c066a3 100644 --- a/addons/mail/static/src/js/followers.js +++ b/addons/mail/static/src/js/followers.js @@ -268,9 +268,11 @@ var Followers = form_common.AbstractField.extend({ if (this.message_is_follower) { this.$('button.o_followers_follow_button').removeClass('o_followers_notfollow').addClass('o_followers_following'); this.$('.o_subtypes_list > .dropdown-toggle').attr('disabled', false); + this.$('.o_followers_actions .dropdown-toggle').addClass('o_followers_following') } else { this.$('button.o_followers_follow_button').removeClass('o_followers_following').addClass('o_followers_notfollow'); this.$('.o_subtypes_list > .dropdown-toggle').attr('disabled', true); + this.$('.o_followers_actions .dropdown-toggle').removeClass('o_followers_following') } }, diff --git a/addons/mail/static/src/less/followers.less b/addons/mail/static/src/less/followers.less index 25bd7be1f9a..4057450c2f7 100644 --- a/addons/mail/static/src/less/followers.less +++ b/addons/mail/static/src/less/followers.less @@ -16,6 +16,7 @@ .dropdown-toggle { opacity: 0.3; border: none; + display: none; &:hover, &:focus, &[aria-expanded="true"] { opacity: 1; @@ -24,6 +25,10 @@ > .fa { font-size: inherit; } + + &.o_followers_following { + display: block; + } } &:hover .dropdown-toggle { diff --git a/addons/mail/static/src/xml/followers.xml b/addons/mail/static/src/xml/followers.xml index 939cb531626..24b99241d47 100644 --- a/addons/mail/static/src/xml/followers.xml +++ b/addons/mail/static/src/xml/followers.xml @@ -24,7 +24,7 @@ Following