[MERGE] forward port branch 12.0 up to 3e4138deaa2

closes odoo/odoo#30045

5 files changed, 14 insertions, 5 deletions

diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 05e61a912dd..d2083aa1b65 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -314,7 +314,7 @@
 <div>
     <p>
         <strong><span t-attf-class="fa #{activity.activity_type_id.icon}"/></strong> <span t-field="activity.activity_type_id.name"/> done
-        by <span t-field="activity.user_id.name"/><span t-if="activity.summary">:</span>
+        by <span t-field="activity.env.user.name"/><span t-if="activity.summary">:</span>
         <span t-if="activity.summary" t-field="activity.summary"/>
     </p>
     <div t-field="activity.note" style="margin-left: 8px;"/>
diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py
index f7384a87b8f..99996615094 100644
--- a/addons/mail/models/mail_channel.py
+++ b/addons/mail/models/mail_channel.py
@@ -280,6 +280,7 @@ class Channel(models.Model):
         channel_partner = self.mapped('channel_last_seen_partner_ids').filtered(lambda cp: cp.partner_id == self.env.user.partner_id)
         if not channel_partner:
             return self.write({'channel_last_seen_partner_ids': [(0, 0, {'partner_id': self.env.user.partner_id.id})]})
+        return False
 
     @api.multi
     def action_unfollow(self):
@@ -852,12 +853,12 @@ class Channel(models.Model):
     @api.multi
     def channel_join_and_get_info(self):
         self.ensure_one()
-        if self.channel_type == 'channel' and not self.email_send:
+        added = self.action_follow()
+        if added and self.channel_type == 'channel' and not self.email_send:
             notification = _('<div class="o_mail_notification">joined <a href="#" class="o_channel_redirect" data-oe-id="%s">#%s</a></div>') % (self.id, self.name,)
             self.message_post(body=notification, message_type="notification", subtype="mail.mt_comment")
-        self.action_follow()
 
-        if self.moderation_guidelines:
+        if added and self.moderation_guidelines:
             self._send_guidelines(self.env.user.partner_id)
 
         channel_info = self.channel_info('join')[0]
diff --git a/addons/mail/static/src/js/tools/debug_manager.js b/addons/mail/static/src/js/tools/debug_manager.js
index 4c768e8bb2d..452a062806f 100644
--- a/addons/mail/static/src/js/tools/debug_manager.js
+++ b/addons/mail/static/src/js/tools/debug_manager.js
@@ -23,6 +23,10 @@ DebugManager.include({
             views: [[false, 'list'], [false, 'form']],
             type: 'ir.actions.act_window',
             domain: [['res_id', '=', selectedIDs[0]], ['model', '=', this._controller.modelName]],
+            context: {
+                default_res_model: this._controller.modelName,
+                default_res_id: selectedIDs[0],
+            },
         });
     },
 });
diff --git a/addons/mail/static/tests/tools/debug_manager_tests.js b/addons/mail/static/tests/tools/debug_manager_tests.js
index fa7aecd40d1..8b9312ca733 100644
--- a/addons/mail/static/tests/tools/debug_manager_tests.js
+++ b/addons/mail/static/tests/tools/debug_manager_tests.js
@@ -14,6 +14,10 @@ QUnit.module('Mail DebugManager', {}, function () {
             intercepts: {
                 do_action: function (event) {
                     assert.deepEqual(event.data.action, {
+                      context: {
+                        default_res_model: "testModel",
+                        default_res_id: 5,
+                      },
                         res_model: 'mail.message',
                         name: "Manage Messages",
                         views: [[false, 'list'], [false, 'form']],
diff --git a/addons/mail/wizard/mail_resend_message.py b/addons/mail/wizard/mail_resend_message.py
index c8ea6bb73c3..12255735871 100644
--- a/addons/mail/wizard/mail_resend_message.py
+++ b/addons/mail/wizard/mail_resend_message.py
@@ -68,7 +68,7 @@ class MailResendMessage(models.TransientModel):
                 rdata = []
                 for pid, cid, active, pshare, ctype, notif, groups in self.env['mail.followers']._get_recipient_data(None, False, pids=to_send.ids):
                     if pid and notif == 'email' or not notif:
-                        pdata = {'id': pid, 'share': pshare, 'active': active, 'notif': 'email', 'groups': groups}
+                        pdata = {'id': pid, 'share': pshare, 'active': active, 'notif': 'email', 'groups': groups or []}
                         if not pshare and notif:  # has an user and is not shared, is therefore user
                             rdata.append(dict(pdata, type='user'))
                         elif pshare and notif:  # has an user and is shared, is therefore portal