From 01709c6a741d062a7239bab82414f813679074f4 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 13 Dec 2021 14:06:22 +0000 Subject: [PATCH] [IMP] mail: rename canned response model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.canned_response` to `CannedResponse` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81318 Signed-off-by: Alexandre Kühn (aku) --- .../composer_suggestion/composer_suggestion.js | 2 +- .../composer_suggestion_canned_response_tests.js | 12 ++++++------ .../src/models/canned_response/canned_response.js | 4 ++-- .../static/src/models/composer_view/composer_view.js | 2 +- addons/mail/static/src/models/messaging/messaging.js | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js index 833364d55e9..0adf15885e1 100644 --- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js +++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js @@ -28,7 +28,7 @@ export class ComposerSuggestion extends Component { } get isCannedResponse() { - return this.props.modelName === "mail.canned_response"; + return this.props.modelName === "CannedResponse"; } get isChannel() { diff --git a/addons/mail/static/src/components/composer_suggestion/tests/composer_suggestion_canned_response_tests.js b/addons/mail/static/src/components/composer_suggestion/tests/composer_suggestion_canned_response_tests.js index fb665d82645..bf7300187b8 100644 --- a/addons/mail/static/src/components/composer_suggestion/tests/composer_suggestion_canned_response_tests.js +++ b/addons/mail/static/src/components/composer_suggestion/tests/composer_suggestion_canned_response_tests.js @@ -31,14 +31,14 @@ QUnit.test('canned response suggestion displayed', async function (assert) { id: 20, model: 'mail.channel', }); - const cannedResponse = this.messaging.models['mail.canned_response'].create({ + const cannedResponse = this.messaging.models['CannedResponse'].create({ id: 7, source: 'hello', substitution: "Hello, how are you?", }); await createComposerSuggestionComponent(thread.composer, { isActive: true, - modelName: 'mail.canned_response', + modelName: 'CannedResponse', recordLocalId: cannedResponse.localId, }); @@ -58,14 +58,14 @@ QUnit.test('canned response suggestion correct data', async function (assert) { id: 20, model: 'mail.channel', }); - const cannedResponse = this.messaging.models['mail.canned_response'].create({ + const cannedResponse = this.messaging.models['CannedResponse'].create({ id: 7, source: 'hello', substitution: "Hello, how are you?", }); await createComposerSuggestionComponent(thread.composer, { isActive: true, - modelName: 'mail.canned_response', + modelName: 'CannedResponse', recordLocalId: cannedResponse.localId, }); @@ -105,14 +105,14 @@ QUnit.test('canned response suggestion active', async function (assert) { id: 20, model: 'mail.channel', }); - const cannedResponse = this.messaging.models['mail.canned_response'].create({ + const cannedResponse = this.messaging.models['CannedResponse'].create({ id: 7, source: 'hello', substitution: "Hello, how are you?", }); await createComposerSuggestionComponent(thread.composer, { isActive: true, - modelName: 'mail.canned_response', + modelName: 'CannedResponse', recordLocalId: cannedResponse.localId, }); diff --git a/addons/mail/static/src/models/canned_response/canned_response.js b/addons/mail/static/src/models/canned_response/canned_response.js index e8a937161ef..069309adb61 100644 --- a/addons/mail/static/src/models/canned_response/canned_response.js +++ b/addons/mail/static/src/models/canned_response/canned_response.js @@ -5,7 +5,7 @@ import { attr } from '@mail/model/model_field'; import { cleanSearchTerm } from '@mail/utils/utils'; registerModel({ - name: 'mail.canned_response', + name: 'CannedResponse', identifyingFields: ['id'], modelMethods: { /** @@ -59,7 +59,7 @@ registerModel({ * @param {Object} [options={}] * @param {Thread} [options.thread] prioritize and/or restrict * result in the context of given thread - * @returns {[mail.canned_response[], mail.canned_response[]]} + * @returns {[CannedResponse[], CannedResponse[]]} */ searchSuggestions(searchTerm, { thread } = {}) { const cleanedSearchTerm = cleanSearchTerm(searchTerm); diff --git a/addons/mail/static/src/models/composer_view/composer_view.js b/addons/mail/static/src/models/composer_view/composer_view.js index 95145d6d9dd..f3531180c8a 100644 --- a/addons/mail/static/src/models/composer_view/composer_view.js +++ b/addons/mail/static/src/models/composer_view/composer_view.js @@ -572,7 +572,7 @@ registerModel({ case '@': return 'Partner'; case ':': - return 'mail.canned_response'; + return 'CannedResponse'; case '/': return 'ChannelCommand'; case '#': diff --git a/addons/mail/static/src/models/messaging/messaging.js b/addons/mail/static/src/models/messaging/messaging.js index 849a9e9dc85..11f0766db4d 100644 --- a/addons/mail/static/src/models/messaging/messaging.js +++ b/addons/mail/static/src/models/messaging/messaging.js @@ -232,7 +232,7 @@ registerModel({ autofetchPartnerImStatus: attr({ default: true, }), - cannedResponses: one2many('mail.canned_response'), + cannedResponses: one2many('CannedResponse'), chatWindowManager: one2one('ChatWindowManager', { default: insertAndReplace(), isCausal: true,