From 840728b4dce7f005fbd781db31c784d42e5d0c34 Mon Sep 17 00:00:00 2001 From: Thanh Dodeur Date: Tue, 13 Oct 2020 12:19:25 +0000 Subject: [PATCH] [FIX] mail: adds shadow to RPCs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds shadow to RPCs that are not supposed to be blocking. task-2352703 closes odoo/odoo#60017 X-original-commit: 4274a061ff1498f647580c38c7048da8a8cb0a9c Signed-off-by: Alexandre Kühn (aku) --- addons/mail/static/src/models/activity/activity.js | 2 +- addons/mail/static/src/models/composer/composer.js | 2 +- .../messaging_initializer/messaging_initializer.js | 2 +- addons/mail/static/src/models/partner/partner.js | 2 +- addons/mail/static/src/models/thread/thread.js | 12 ++++++------ addons/mail/static/src/models/user/user.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/mail/static/src/models/activity/activity.js b/addons/mail/static/src/models/activity/activity.js index f53806220a4..d30d9e6d1a6 100644 --- a/addons/mail/static/src/models/activity/activity.js +++ b/addons/mail/static/src/models/activity/activity.js @@ -147,7 +147,7 @@ function factory(dependencies) { model: 'mail.activity', method: 'activity_format', args: [this.id], - })); + }, { shadow: true })); this.update(this.constructor.convertData(data)); this.thread.refresh(); } diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js index 7ea2e5fbc60..3bb12b29433 100644 --- a/addons/mail/static/src/models/composer/composer.js +++ b/addons/mail/static/src/models/composer/composer.js @@ -277,7 +277,7 @@ function factory(dependencies) { model: 'mail.message', method: 'message_format', args: [[messageId]], - })); + }, { shadow: true })); this.env.models['mail.message'].insert(Object.assign( {}, this.env.models['mail.message'].convertData(messageData), diff --git a/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js b/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js index 6272baf9c84..304faf79674 100644 --- a/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js +++ b/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js @@ -51,7 +51,7 @@ function factory(dependencies) { const data = await this.async(() => this.env.services.rpc({ route: '/mail/init_messaging', params: { context: context } - })); + }, { shadow: true })); await this.async(() => this._init(data)); if (discuss.isOpen) { discuss.openInitThread(); diff --git a/addons/mail/static/src/models/partner/partner.js b/addons/mail/static/src/models/partner/partner.js index 12c6f3676e2..e0aba1322f2 100644 --- a/addons/mail/static/src/models/partner/partner.js +++ b/addons/mail/static/src/models/partner/partner.js @@ -129,7 +129,7 @@ function factory(dependencies) { kwargs: { context: { active_test: false }, }, - })); + }, { shadow: true })); this.update({ hasCheckedUser: true }); if (userIds.length > 0) { this.update({ user: [['insert', { id: userIds[0] }]] }); diff --git a/addons/mail/static/src/models/thread/thread.js b/addons/mail/static/src/models/thread/thread.js index ed48d14f270..cd1ee77b1ce 100644 --- a/addons/mail/static/src/models/thread/thread.js +++ b/addons/mail/static/src/models/thread/thread.js @@ -332,7 +332,7 @@ function factory(dependencies) { model: 'mail.channel', method: 'channel_info', args: [ids], - }); + }, { shadow: true }); const channels = this.env.models['mail.thread'].insert( channelInfos.map(channelInfo => this.env.models['mail.thread'].convertData(channelInfo)) ); @@ -467,7 +467,7 @@ function factory(dependencies) { model, res_ids, }, - }); + }, { shadow: true }); for (const id in data) { const recipientInfoList = data[id].map(recipientInfoData => { const [partner_id, emailInfo, reason] = recipientInfoData; @@ -516,7 +516,7 @@ function factory(dependencies) { ], fields: ['id', 'name', 'mimetype'], orderBy: [{ name: 'id', asc: false }], - })); + }, { shadow: true })); this.update({ originThreadAttachments: [['insert-and-replace', attachmentsData.map(data => @@ -736,12 +736,12 @@ function factory(dependencies) { model: this.model, method: 'read', args: [this.id, ['activity_ids']] - })); + }, { shadow: true })); const activitiesData = await this.async(() => this.env.services.rpc({ model: 'mail.activity', method: 'activity_format', args: [newActivityIds] - })); + }, { shadow: true })); const activities = this.env.models['mail.activity'].insert(activitiesData.map( activityData => this.env.models['mail.activity'].convertData(activityData) )); @@ -762,7 +762,7 @@ function factory(dependencies) { res_id: this.id, res_model: this.model, }, - })); + }, { shadow: true })); if (followers.length > 0) { this.update({ followers: [['insert-and-replace', followers.map(data => diff --git a/addons/mail/static/src/models/user/user.js b/addons/mail/static/src/models/user/user.js index 7fc23b1e17f..2decc8efd92 100644 --- a/addons/mail/static/src/models/user/user.js +++ b/addons/mail/static/src/models/user/user.js @@ -67,7 +67,7 @@ function factory(dependencies) { context, fields, }, - }); + }, { shadow: true }); return this.env.models['mail.user'].insert(usersData.map(userData => this.env.models['mail.user'].convertData(userData) ));