diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
| commit | cf52a04979d7634908c2f0d8eb6a83b7dd614f64 (patch) | |
| tree | 2f8c25f3fab45268400c4ac6addfa15f1f2d37f0 /addons/mail/static/src/js/services | |
| parent | cd1f57e9ded2e8ca81d7290e4b5b95a8776045c6 (diff) | |
| parent | d3b8422c9c44557256836bdc0da5480f553eec4d (diff) | |
[MERGE] forward port branch saas-12.1 up to d3b8422c9c4
closes odoo/odoo#30614
Diffstat (limited to 'addons/mail/static/src/js/services')
| -rw-r--r-- | addons/mail/static/src/js/services/mail_notification_manager.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/services/mail_window_manager.js | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js index 140266285c7..b59d7b91434 100644 --- a/addons/mail/static/src/js/services/mail_notification_manager.js +++ b/addons/mail/static/src/js/services/mail_notification_manager.js @@ -490,7 +490,7 @@ MailManager.include({ var self = this; var partnerID = data.partner_id; this.call('bus_service', 'sendNotification', data.title, data.message, function ( ){ - self.call('mail_service', 'openDmWindow', partnerID); + self.call('mail_service', 'openDMChatWindowFromBlankThreadWindow', partnerID); }); }, /** 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 64cf6bb88c9..c8e05957afb 100644 --- a/addons/mail/static/src/js/services/mail_window_manager.js +++ b/addons/mail/static/src/js/services/mail_window_manager.js @@ -531,9 +531,6 @@ MailManager.include({ * @private */ _repositionThreadWindows: function () { - if (this._areAllThreadWindowsHidden()) { - return; - } this._computeAvailableSlotsForThreadWindows(); this._repositionVisibleThreadWindows(); @@ -575,9 +572,6 @@ MailManager.include({ * the focus is on the thread window. */ _updateThreadWindowsFromMessage: function (message, options) { - if (this._areAllThreadWindowsHidden()) { - return; - } _.each(this._threadWindows, function (threadWindow) { if (_.contains(message.getThreadIDs(), threadWindow.getID())) { threadWindow.update(options); |
