From 57fe16ef617bc1ba6fa71aa45c1a64a2402e5f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 21 Jan 2021 13:56:06 +0000 Subject: [PATCH] [IMP] mail: make some tools methods private PURPOSE Reorganize and lint mail.channel code. Purpose is to ease future modifications linked to groups and channels in mail / Discuss. SPECIFICATIONS Some tools methods do not necessarily require to be public. LINKS Prepares Task ID-2070632 (Discuss channel task) Prepares Task ID-2419762 (SM channel task) COM PR odoo/odoo#64862 --- addons/hr_holidays/models/mail_channel.py | 4 ++-- addons/mail/models/mail_channel.py | 4 ++-- addons/mail/static/tests/helpers/mock_server.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/hr_holidays/models/mail_channel.py b/addons/hr_holidays/models/mail_channel.py index 166caa37d3e..4a1105d97e7 100644 --- a/addons/hr_holidays/models/mail_channel.py +++ b/addons/hr_holidays/models/mail_channel.py @@ -7,8 +7,8 @@ from odoo import fields, models class Channel(models.Model): _inherit = 'mail.channel' - def partner_info(self, all_partners, direct_partners): - partner_infos = super(Channel, self).partner_info(all_partners, direct_partners) + def _get_channel_partner_info(self, all_partners, direct_partners): + partner_infos = super(Channel, self)._get_channel_partner_info(all_partners, direct_partners) # only search for leave out_of_office_date_end if im_status is on leave partners_on_leave = [partner_id for partner_id in direct_partners.ids if 'leave' in partner_infos[partner_id]['im_status']] if partners_on_leave: diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index db1b39de91e..237edf8ef50 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -621,7 +621,7 @@ class Channel(models.Model): # ------------------------------------------------------------ @api.model - def partner_info(self, all_partners, direct_partners): + def _get_channel_partner_info(self, all_partners, direct_partners): """ Return the information needed by channel to display channel members :param all_partners: list of res.parner(): @@ -654,7 +654,7 @@ class Channel(models.Model): all_partners = all_partner_channel.mapped('partner_id') direct_channel_partners = all_partner_channel.filtered(lambda pc: channel_dict[pc.channel_id.id].channel_type == 'chat') direct_partners = direct_channel_partners.mapped('partner_id') - partner_infos = self.partner_info(all_partners, direct_partners) + partner_infos = self._get_channel_partner_info(all_partners, direct_partners) # add last message preview (only used in mobile) addPreview = self._context.get('isMobile', False) diff --git a/addons/mail/static/tests/helpers/mock_server.js b/addons/mail/static/tests/helpers/mock_server.js index 71adf0e043e..11ad476b3e2 100644 --- a/addons/mail/static/tests/helpers/mock_server.js +++ b/addons/mail/static/tests/helpers/mock_server.js @@ -1028,7 +1028,7 @@ MockServer.include({ this._widget.call('bus_service', 'trigger', 'notification', notifications); }, /** - * Simulates `partner_info` on `mail.channel`. + * Simulates `_get_channel_partner_info` on `mail.channel`. * * @private * @param {integer[]} all_partners