diff options
| author | Didier (did) <did@odoo.com> | 2020-10-29 09:41:43 +0000 |
|---|---|---|
| committer | Didier (did) <did@odoo.com> | 2020-11-02 12:50:20 +0000 |
| commit | 7ead0bf2e3e15ec161415bfa270a2c42a66fbbe3 (patch) | |
| tree | 32f853b280ecf15d64bc15775963396101f326ec /addons | |
| parent | 5064bfa85dcf35410ed0e0053b675debf6883484 (diff) | |
[FIX] mail: backport fix from the required field PR
https://github.com/odoo/enterprise/pull/13883
task-2323665
closes odoo/odoo#60948
Related: odoo/enterprise#14468
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons')
3 files changed, 6 insertions, 1 deletions
diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js b/addons/mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js index f8409de2da9..047fc997b49 100644 --- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js +++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion_channel_tests.js @@ -50,6 +50,7 @@ QUnit.test('channel mention suggestion displayed', async function (assert) { const channel = this.env.models['mail.thread'].create({ id: 7, name: "General", + model: 'mail.channel', }); await this.createComposerSuggestion({ composerLocalId: thread.composer.localId, @@ -77,6 +78,7 @@ QUnit.test('channel mention suggestion correct data', async function (assert) { const channel = this.env.models['mail.thread'].create({ id: 7, name: "General", + model: 'mail.channel', }); await this.createComposerSuggestion({ composerLocalId: thread.composer.localId, @@ -114,6 +116,7 @@ QUnit.test('partner mention suggestion active', async function (assert) { const channel = this.env.models['mail.thread'].create({ id: 7, name: "General", + model: 'mail.channel', }); await this.createComposerSuggestion({ composerLocalId: thread.composer.localId, diff --git a/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js b/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js index 04ca8b08e18..2afd997a42b 100644 --- a/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js +++ b/addons/mail/static/src/components/discuss/tests/discuss_moderation_tests.js @@ -986,7 +986,7 @@ QUnit.test('as moderator, new pending moderation message posted by someone else' // simulate receiving the message const messageData = { - author_id: 10, // random id, different than current partner + author_id: [10, 'john doe'], // random id, different than current partner body: "not empty", channel_ids: [], // server do NOT return channel_id of the message if pending moderation id: 1, // random unique id diff --git a/addons/website_slides/static/src/components/activity/activity_tests.js b/addons/website_slides/static/src/components/activity/activity_tests.js index d8e465a4237..d754428cf62 100644 --- a/addons/website_slides/static/src/components/activity/activity_tests.js +++ b/addons/website_slides/static/src/components/activity/activity_tests.js @@ -55,6 +55,7 @@ QUnit.test('grant course access', async function (assert) { }, }); const activity = this.env.models['mail.activity'].create({ + id: 100, canWrite: true, thread: [['insert', { id: 100, @@ -94,6 +95,7 @@ QUnit.test('refuse course access', async function (assert) { }, }); const activity = this.env.models['mail.activity'].create({ + id: 100, canWrite: true, thread: [['insert', { id: 100, |