diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-31 17:43:40 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-08-01 09:46:32 +0200 |
| commit | 458bf6b9d9b586747b8e2e617fcfd99495ea60b3 (patch) | |
| tree | f569d616635c895ebf536e21f4aac6ecd7e8ddb8 | |
| parent | 5752a8643a9f07fec66082930608848f48101cf6 (diff) | |
[FIX] mail: BS4, restore follower subtype style
Behavior is still broken and will be fixed in a future update.
| -rw-r--r-- | addons/mail/static/src/js/followers.js | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/followers.scss | 5 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/followers.xml | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/addons/mail/static/src/js/followers.js b/addons/mail/static/src/js/followers.js index 42d5519ff40..d874c46b584 100644 --- a/addons/mail/static/src/js/followers.js +++ b/addons/mail/static/src/js/followers.js @@ -19,7 +19,7 @@ var Followers = AbstractField.extend({ // click on '(Un)Follow' button, that toggles the follow for uid 'click .o_followers_follow_button': '_onFollowButtonClicked', // click on a subtype, that (un)subscribes for this subtype - 'click .o_subtypes_list input': '_onSubtypeClicked', + 'click .o_subtypes_list .custom-checkbox': '_onSubtypeClicked', // click on 'invite' button, that opens the invite wizard 'click .o_add_follower': '_onAddFollower', 'click .o_add_follower_channel': '_onAddChannel', @@ -286,7 +286,7 @@ var Followers = AbstractField.extend({ // If no more subtype followed, unsubscribe the follower if (!checklist.length) { this._unfollow(ids).fail(function () { - $(event.target).prop('checked', true); + $(event.currentTarget).find('input').addBack('input').prop('checked', true); }); } else { var kwargs = _.extend({}, ids); diff --git a/addons/mail/static/src/scss/followers.scss b/addons/mail/static/src/scss/followers.scss index 635e37c902c..75661c65171 100644 --- a/addons/mail/static/src/scss/followers.scss +++ b/addons/mail/static/src/scss/followers.scss @@ -4,11 +4,6 @@ display: none !important; // Hide the followers in mobile } - .dropdown-menu { - right: 0; - left: auto; - } - .o_followers_actions { position: relative; float: right; diff --git a/addons/mail/static/src/xml/followers.xml b/addons/mail/static/src/xml/followers.xml index 6ae0c6cacb9..959ee165797 100644 --- a/addons/mail/static/src/xml/followers.xml +++ b/addons/mail/static/src/xml/followers.xml @@ -12,7 +12,7 @@ <i class="fa fa-user" role="img" aria-label="Dropdown menu - Followers"></i> <span class="o_followers_count"/> </button> - <div class="dropdown-menu o_followers_list" role="menu"/> + <div class="dropdown-menu dropdown-menu-right o_followers_list" role="menu"/> </div> <div class="o_followers_actions"> <div class="btn-group o_subtypes_list"> @@ -25,7 +25,7 @@ </button><button class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <span class="fa fa-bell" role="img" aria-label="Alarm menu" title="Alarm menu"/> </button> - <div class="dropdown-menu" role="menu"/> + <div class="dropdown-menu dropdown-menu-right" role="menu"/> </div> </div> </div> |