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

[FIX] mail: overlapping calls to get_channel_preview

Browse Source 
Problem occured when the first call to get_channel_preview was directly
followed by others, before the channels_preview_def was resolved. In that case,
the other calls all returned an empty array, as only the channels_preview
array was only filled with the RPC result for the first call to
get_channel_preview (the one which initiated the RPC).
This commit is contained in:
Aaron Bohy
2016-02-08 08:29:52 +01:00
parent 021f9aeec7
commit 377bcd202f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/chat_manager.js
+11 -11
View File
@@ -962,22 +962,22 @@ var chat_manager = {
}
return info;
});
var missing_channels = _.where(channels_preview, {last_message: undefined});
if (!channels_preview_def) {
var missing_channel_ids = _.pluck(_.where(channels_preview, {last_message: undefined}), 'id');
if (missing_channel_ids.length) {
channels_preview_def = ChannelModel
.call('channel_fetch_preview', [missing_channel_ids], {}, {shadow: true})
.then(function (channels) {
_.each(channels, function (channel) {
var msg = add_message(channel.last_message);
_.findWhere(channels_preview, {id: channel.id}).last_message = msg;
});
});
if (missing_channels.length) {
var missing_channel_ids = _.pluck(missing_channels, 'id');
channels_preview_def = ChannelModel.call('channel_fetch_preview', [missing_channel_ids], {}, {shadow: true});
} else {
channels_preview_def = $.when();
}
}
return channels_preview_def.then(function () {
return channels_preview_def.then(function (channels) {
_.each(missing_channels, function (channel_preview) {
var channel = _.findWhere(channels, {id: channel_preview.id});
if (channel) {
channel_preview.last_message = add_message(channel.last_message);
}
});
return _.filter(channels_preview, function (channel) {
return channel.last_message; // remove empty channels
});