Merge PR #1531 into 12.0

Signed-off-by simahawk
pull/1690/head
OCA-git-bot 2020-09-07 07:30:14 +00:00
commit 89377c16b3
1 changed files with 17 additions and 6 deletions

View File

@ -26,15 +26,26 @@ odoo.define('web_notify.WebClient', function (require) {
this.channel_info, this.channel_info,
this.channel_default, this.channel_default,
]; ];
this.call('bus_service', 'addChannel', this.channel_success);
this.call('bus_service', 'addChannel', this.channel_danger); // startPolling to get this new tab registered,
this.call('bus_service', 'addChannel', this.channel_warning); // in order to be able to call isMasterTab
this.call('bus_service', 'addChannel', this.channel_info); this.call('bus_service', 'startPolling');
this.call('bus_service', 'addChannel', this.channel_default);
// - no need to add channels again if it was done already
// - this is also a workaround for the infinite loop issue
// that occures when user logs in as a different user
// while still being logged in 2+ other tabs
if(this.call('bus_service', 'isMasterTab')) {
this.call('bus_service', 'addChannel', this.channel_success);
this.call('bus_service', 'addChannel', this.channel_danger);
this.call('bus_service', 'addChannel', this.channel_warning);
this.call('bus_service', 'addChannel', this.channel_info);
this.call('bus_service', 'addChannel', this.channel_default);
}
this.call( this.call(
'bus_service', 'on', 'notification', 'bus_service', 'on', 'notification',
this, this.bus_notification); this, this.bus_notification);
this.call('bus_service', 'startPolling');
}, },
bus_notification: function (notifications) { bus_notification: function (notifications) {
var self = this; var self = this;