From b93ad321fe2d15f76690241afb98b7fa2d26408f Mon Sep 17 00:00:00 2001 From: Kaushalya Mandaliya Date: Fri, 15 Feb 2019 10:40:21 +0000 Subject: [PATCH] [IMP] mail: follower name in confirmation dialog on unfollow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixing test so that it uses an existing follower. Task-ID 1919551 closes odoo/odoo#31139 Signed-off-by: Alexandre Kühn (aku) --- addons/mail/static/src/js/followers.js | 4 +++- addons/mail/static/tests/chatter_tests.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/js/followers.js b/addons/mail/static/src/js/followers.js index 9fe3d9f00bc..ee7b66170e2 100644 --- a/addons/mail/static/src/js/followers.js +++ b/addons/mail/static/src/js/followers.js @@ -248,8 +248,10 @@ var Followers = AbstractField.extend({ _unfollow: function (ids) { var self = this; return new Promise(function (resolve, reject) { - var text = _t("Warning! \n If you remove a follower, he won't be notified of any email or discussion on this document.\n Do you really want to remove this follower ?"); + var follower = _.find(self.followers, { res_id: ids.partner_ids ? ids.partner_ids[0] : ids.channel_ids[0] }); + var text = _.str.sprintf(_t("If you remove a follower, he won't be notified of any email or discussion on this document. Do you really want to remove %s?"), follower.name); Dialog.confirm(this, text, { + title: _t("Warning"), confirm_callback: function () { var args = [ [self.res_id], diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js index 582448f1bc7..bcf30f2c434 100644 --- a/addons/mail/static/tests/chatter_tests.js +++ b/addons/mail/static/tests/chatter_tests.js @@ -2085,7 +2085,7 @@ QUnit.test('followers widget: follow/unfollow, edit subtypes', async function (a assert.expect(24); var resID = 2; - var partnerID = 1; + var partnerID = 2; var followers = []; var nbReads = 0; var subtypes = [