diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js index f09f42381f4..ffdabefda15 100644 --- a/addons/mail/static/src/js/services/mail_manager.js +++ b/addons/mail/static/src/js/services/mail_manager.js @@ -445,7 +445,7 @@ var MailManager = AbstractService.extend({ var channel = this.getChannel(data.id); if (!channel) { channel = this._makeChannel(data, options); - if (channel.getType() === 'dm') { + if (channel.getType() === 'dm_chat') { this._pinnedDmPartners.push(channel.getDirectPartnerID()); this.call('bus_service', 'updateOption', 'bus_presence_partner_ids', @@ -1048,7 +1048,7 @@ var MailManager = AbstractService.extend({ userIDs[0] !== session.uid && dmRedirection ) { - self.createChannel(resID, 'dm').then(dmRedirection); + self.createChannel(resID, 'dm_chat').then(dmRedirection); } else { self._redirectToDocument(resModel, resID); } @@ -1064,7 +1064,7 @@ var MailManager = AbstractService.extend({ */ _removeChannel: function (channel) { if (!channel) { return; } - if (channel.getType() === 'dm') { + if (channel.getType() === 'dm_chat') { var index = this._pinnedDmPartners.indexOf(channel.getDirectPartnerID()); if (index > -1) { this._pinnedDmPartners.splice(index, 1); diff --git a/addons/mail/static/src/js/services/mail_window_manager.js b/addons/mail/static/src/js/services/mail_window_manager.js index e2f6f0fb174..7b892fa8731 100644 --- a/addons/mail/static/src/js/services/mail_window_manager.js +++ b/addons/mail/static/src/js/services/mail_window_manager.js @@ -418,7 +418,7 @@ MailManager.include({ var blankThreadWindow = this._getBlankThreadWindow(); if ( blankThreadWindow && - thread.getType() === 'dm' && + thread.getType() === 'dm_chat' && thread.getDirectPartnerID() === blankThreadWindow.directPartnerID ) { // the window takes the place of the 'blank' thread window diff --git a/addons/mail/static/src/js/tour.js b/addons/mail/static/src/js/tour.js index ffbe69de525..10ee548b00b 100644 --- a/addons/mail/static/src/js/tour.js +++ b/addons/mail/static/src/js/tour.js @@ -24,7 +24,7 @@ tour.register('mail_tour', [{ content: _t("Once a message has been starred, you can come back and review it at any time here."), position: "bottom", }, { - trigger: '.o_mail_discuss .o_mail_discuss_sidebar .o_add[data-type="dm"]', + trigger: '.o_mail_discuss .o_mail_discuss_sidebar .o_add[data-type="dm_chat"]', content: _t("

Chat with coworkers in real-time using direct messages.

You might need to invite users from the Settings app first.

"), position: 'bottom', }]);