diff options
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/models/mail_thread.py | 9 | ||||
| -rw-r--r-- | addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 6e0f725ae41..3064c391a91 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -2176,14 +2176,6 @@ class MailThread(models.AbstractModel): if channel_ids: channels = self.env['mail.channel'].sudo().browse(channel_ids) bus_notifications += channels._channel_message_notifications(message, message_format_values) - # Message from mailing channel should not make a notification in Odoo for users - # with notification "Handled by Email", but web client should receive the message. - # To do so, message is still sent from longpolling, but channel is marked as read - # in order to remove notification. - for channel in channels.filtered(lambda c: c.email_send): - users = channel.channel_partner_ids.mapped('user_ids') - for user in users.filtered(lambda u: u.notification_type == 'email'): - channel.with_user(user).channel_seen(message.id) if bus_notifications: self.env['bus.bus'].sudo().sendmany(bus_notifications) @@ -2464,6 +2456,7 @@ class MailThread(models.AbstractModel): exept_partner = [r['id'] for r in recipient_data['partners']] if author_id: exept_partner.append(author_id) + sql_query = """ select distinct on (p.id) p.id from res_partner p left join mail_channel_partner mcp on p.id = mcp.partner_id left join mail_channel c on c.id = mcp.channel_id diff --git a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js index f1ce13bec21..a42ede1c6ae 100644 --- a/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js +++ b/addons/mail/static/src/models/messaging_notification_handler/messaging_notification_handler.js @@ -241,6 +241,10 @@ function factory(dependencies) { channel.mass_mailing && this.env.session.notification_type === 'email' ) { + this._handleNotificationChannelSeen(channelId, { + last_message_id: messageData.id, + partner_id: this.env.messaging.currentPartner.id, + }); return; } // In all other cases: update counter and notify if necessary |