From c9ff3672cac0308305d5d4094f8dba294c495f38 Mon Sep 17 00:00:00 2001 From: "Didier (did)" Date: Fri, 23 Oct 2020 13:33:10 +0000 Subject: [PATCH] [FIX] mail: force the model when creating basic thread MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fw of ca6cc05cec13f2e3f1d6555491c3180e9ff3ace2 closes odoo/odoo#60645 Signed-off-by: Sébastien Theys (seb) Signed-off-by: Alexandre Kühn (aku) --- addons/mail/static/src/models/composer/composer.js | 8 +++++--- .../models/messaging_initializer/messaging_initializer.js | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js index 161e884279a..58bdb3c8b25 100644 --- a/addons/mail/static/src/models/composer/composer.js +++ b/addons/mail/static/src/models/composer/composer.js @@ -673,9 +673,11 @@ function factory(dependencies) { this.update({ suggestedChannels: [[ 'insert-and-replace', - mentions.map(data => - this.env.models['mail.thread'].convertData(data)) - ]], + mentions.map(data => { + const threadData = this.env.models['mail.thread'].convertData(data); + return Object.assign({ model: 'mail.channel' }, threadData); + }) + ]], }); if (this.suggestedChannels[0]) { 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 f0ed367d092..13da76dbb38 100644 --- a/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js +++ b/addons/mail/static/src/models/messaging_initializer/messaging_initializer.js @@ -163,7 +163,9 @@ function factory(dependencies) { // channels received at init. convertedData.members = [['link', this.env.messaging.currentPartner]]; } - const channel = this.env.models['mail.thread'].insert(convertedData); + const channel = this.env.models['mail.thread'].insert( + Object.assign({ model: 'mail.channel' }, convertedData) + ); // flux specific: channels received at init have to be // considered pinned. task-2284357 if (!channel.isPinned) {