From 672f2b23832f92546e8a6f82ddc291f86fa14ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Fri, 17 Mar 2023 16:09:00 +0000 Subject: [PATCH] [FIX] mail: return guests in /who command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes odoo/odoo#117717 X-original-commit: e4d832804b6d317a4dedc6a11e2e62c1721a6190 Signed-off-by: Sébastien Theys (seb) --- addons/mail/models/mail_channel.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index 7ec81bacfa5..be993ad1061 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -1227,15 +1227,15 @@ class Channel(models.Model): self.channel_pin(False) def execute_command_who(self, **kwargs): - partner = self.env.user.partner_id + channel_members = self.env['mail.channel.member'].with_context(active_test=False).search([('partner_id', '!=', self.env.user.partner_id.id), ('channel_id', '=', self.id)]) members = [ - p._get_html_link(title=f"@{p.name}") - for p in self.channel_partner_ids[:30] if p != partner + m.partner_id._get_html_link(title=f"@{m.partner_id.name}") if m.partner_id else f'@{html_escape(m.guest_id.name)}' + for m in channel_members[:30] ] if len(members) == 0: msg = _("You are alone in this channel.") else: - dots = "..." if len(members) != len(self.channel_partner_ids) - 1 else "" + dots = "..." if len(members) != len(channel_members) else "" msg = _("Users in this channel: %(members)s %(dots)s and you.", members=", ".join(members), dots=dots) - self._send_transient_message(partner, msg) + self._send_transient_message(self.env.user.partner_id, msg)