pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: fetch channel info on new message notification

Browse Source 
When receiving a new message, we add it in the client side cache of the
corresponding channel. The problem was that when we previously unsubscribed
to this channel, it was removed from the cache, producing a traceback when
trying to add the new message.

This rev. checks whether or not the channel is in the cache, and if not,
performs an rpc to fetch its info before adding the message.
This commit is contained in:
Aaron Bohy
2015-10-02 15:49:10 +02:00
parent 8a99491793
commit 98bd82365c
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/chat_manager.js
+17 -7
View File
@@ -376,15 +376,17 @@ var chat_manager = {
bus.restart_poll();
});
},
join_channel: function (channel_id) {
join_channel: function (channel_id, options) {
return ChannelModel
.call('channel_join_and_get_info', [[channel_id]])
.then(add_channel);
.then(function (result) {
add_channel(result, options);
});
},
unsubscribe: function (channel_id) {
var def;
var channel = chat_manager.get_channel(channel_id);
var channel = chat_manager.get_channel(channel_id);
if (channel.type === "dm") {
def = ChannelModel.call('channel_pin', [channel.uuid, false]);
} else {
@@ -441,11 +443,19 @@ function init () {
// new message in a channel
var message = notification[1];
var channel_id = message.channel_ids[0];
message = add_message(message, { channel_id: channel_id, show_notification: true} );
if (_.contains(message.channel_ids, 'channel_inbox')) {
needaction_counter = needaction_counter + 1;
chat_manager.bus.trigger('update_needaction', needaction_counter);
// fetch the channel info if not done already
var channel = _.findWhere(channels, {id: channel_id});
var channel_ready;
if (!channel) {
channel_ready = chat_manager.join_channel(channel_id, { autoswitch: false });
}
$.when(channel_ready).then(function () {
message = add_message(message, { channel_id: channel_id, show_notification: true });
if (_.contains(message.channel_ids, 'channel_inbox')) {
needaction_counter = needaction_counter + 1;
chat_manager.bus.trigger('update_needaction', needaction_counter);
}
});
}
if (model === 'res.partner') {
var chat_session = notification[1];