From e42446600e18a0cb781a2b6c26eb495fcd0e8093 Mon Sep 17 00:00:00 2001 From: Renaud Thiry Date: Thu, 23 Jun 2022 06:32:04 +0000 Subject: [PATCH] [FIX] mail: Update legacy arguments for services.action.doAction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emails could not be resent from the chatter after failing to be sent. This was due to parts of code not being updated after a refactoring of OWL. Multiple other instances of non-updated code are updated here. Task-2887153 closes odoo/odoo#94529 X-original-commit: 8fbdb1b52b9051e92e4980d5af73460a46fe70da Signed-off-by: Sébastien Theys (seb) --- addons/mail/static/src/models/discuss.js | 2 +- addons/mail/static/src/models/message.js | 2 +- .../tests/qunit_suite_tests/components/message_tests.js | 2 +- addons/sms/static/src/models/message.js | 2 +- .../tests/qunit_suite_tests/components/message_tests.js | 2 +- addons/snailmail/static/src/models/message.js | 4 ++-- .../tests/qunit_suite_tests/components/message_tests.js | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/mail/static/src/models/discuss.js b/addons/mail/static/src/models/discuss.js index 19cbbe55177..492e47d34d7 100644 --- a/addons/mail/static/src/models/discuss.js +++ b/addons/mail/static/src/models/discuss.js @@ -166,7 +166,7 @@ registerModel({ 'mail.action_discuss', { active_id: this.threadToActiveId(this), - clear_breadcrumbs: false, + clearBreadcrumbs: false, on_reverse_breadcrumb: () => this.close(), // this is useless, close is called by destroy anyway }, ); diff --git a/addons/mail/static/src/models/message.js b/addons/mail/static/src/models/message.js index 7779d89fb33..8a793cf2dd0 100644 --- a/addons/mail/static/src/models/message.js +++ b/addons/mail/static/src/models/message.js @@ -225,7 +225,7 @@ registerModel({ this.env.services.action.doAction( 'mail.mail_resend_message_action', { - additional_context: { + additionalContext: { mail_message_to_resend: this.id, }, } diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js index 19e19abfb9a..2d37565d1b5 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js @@ -200,7 +200,7 @@ QUnit.test('Notification Error', async function (assert) { "action should be the one to resend email" ); assert.strictEqual( - options.additional_context.mail_message_to_resend, + options.additionalContext.mail_message_to_resend, mailMessageId, "action should have correct message id" ); diff --git a/addons/sms/static/src/models/message.js b/addons/sms/static/src/models/message.js index 1ff1604bac8..b7f9e79a6ab 100644 --- a/addons/sms/static/src/models/message.js +++ b/addons/sms/static/src/models/message.js @@ -13,7 +13,7 @@ patchRecordMethods('Message', { this.env.services.action.doAction( 'sms.sms_resend_action', { - additional_context: { + additionalContext: { default_mail_message_id: this.id, }, }, diff --git a/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js b/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js index 1316023bd85..8f4590eac9f 100644 --- a/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js +++ b/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js @@ -123,7 +123,7 @@ QUnit.test('Notification Error', async function (assert) { "action should be the one to resend sms" ); assert.strictEqual( - options.additional_context.default_mail_message_id, + options.additionalContext.default_mail_message_id, mailMessageId1, "action should have correct message id" ); diff --git a/addons/snailmail/static/src/models/message.js b/addons/snailmail/static/src/models/message.js index 2fa26471909..b7a1db224cf 100644 --- a/addons/snailmail/static/src/models/message.js +++ b/addons/snailmail/static/src/models/message.js @@ -25,7 +25,7 @@ addRecordMethods('Message', { this.env.services.action.doAction( 'snailmail.snailmail_letter_format_error_action', { - additional_context: { + additionalContext: { message_id: this.id, }, }, @@ -43,7 +43,7 @@ addRecordMethods('Message', { this.env.services.action.doAction( 'snailmail.snailmail_letter_missing_required_fields_action', { - additional_context: { + additionalContext: { default_letter_id: letterIds[0], }, } diff --git a/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js index 64b1cb220ee..c7abfcc395c 100644 --- a/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js +++ b/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js @@ -568,7 +568,7 @@ QUnit.test('Format Error', async function (assert) { "action should be the one for format error" ); assert.strictEqual( - options.additional_context.message_id, + options.additionalContext.message_id, mailMessageId1, "action should have correct message id" ); @@ -645,7 +645,7 @@ QUnit.test('Missing Required Fields', async function (assert) { "action should be the one for missing fields" ); assert.strictEqual( - options.additional_context.default_letter_id, + options.additionalContext.default_letter_id, snailMailLetterId1, "action should have correct letter id" );