diff options
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/js/systray.js | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 90fbb6ed801..0b7b37ec49f 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -128,7 +128,8 @@ function make_message (data) { subtype_description: data.subtype_description, is_author: data.author_id && data.author_id[0] === session.partner_id, is_note: data.is_note, - is_system_notification: data.message_type === 'notification' && data.model === 'mail.channel', + is_system_notification: (data.message_type === 'notification' && data.model === 'mail.channel') + || data.info === 'transient_message', attachment_ids: data.attachment_ids || [], subject: data.subject, email_from: data.email_from, diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js index aa8c10a0c04..cd49e72042b 100644 --- a/addons/mail/static/src/js/systray.js +++ b/addons/mail/static/src/js/systray.js @@ -42,8 +42,6 @@ var InboxItem = Widget.extend({ }, 1000, true), }); -SystrayMenu.Items.push(InboxItem); - /** * Menu item appended in the systray part of the navbar * @@ -148,5 +146,6 @@ var MessagingMenu = Widget.extend({ }); SystrayMenu.Items.push(MessagingMenu); +SystrayMenu.Items.push(InboxItem); }); |