From 683fc344af2f49b60bf0faedcf3e291f5ae092a7 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 13 Dec 2021 14:51:33 +0000 Subject: [PATCH] [IMP] mail: rename composer model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.composer` to `Composer` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81327 Signed-off-by: Alexandre Kühn (aku) --- .../static/src/components/file_uploader/file_uploader.js | 6 +++--- addons/mail/static/src/models/attachment/attachment.js | 2 +- addons/mail/static/src/models/composer/composer.js | 2 +- .../mail/static/src/models/composer_view/composer_view.js | 2 +- addons/mail/static/src/models/message_view/message_view.js | 2 +- addons/mail/static/src/models/thread/thread.js | 2 +- addons/mail/static/tests/qunit_test.js | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/mail/static/src/components/file_uploader/file_uploader.js b/addons/mail/static/src/components/file_uploader/file_uploader.js index 110a6f743f7..6457dc036d9 100644 --- a/addons/mail/static/src/components/file_uploader/file_uploader.js +++ b/addons/mail/static/src/components/file_uploader/file_uploader.js @@ -63,7 +63,7 @@ export class FileUploader extends Component { /** * @private * @param {Object} param0 - * @param {mail.composer} param0.composer + * @param {Composer} param0.composer * @param {File} param0.file * @param {Thread} param0.thread * @returns {FormData} @@ -81,7 +81,7 @@ export class FileUploader extends Component { /** * @private * @param {Object} param0 - * @param {mail.composer} param0.composer + * @param {Composer} param0.composer * @param {FileList|Array} param0.files * @param {Thread} param0.thread * @returns {Promise} @@ -138,7 +138,7 @@ export class FileUploader extends Component { * @private * @param {Object} param0 * @param {Object} attachmentData - * @param {mail.composer} param0.composer + * @param {Composer} param0.composer * @param {Thread} param0.thread */ _onAttachmentUploaded({ attachmentData, composer, thread }) { diff --git a/addons/mail/static/src/models/attachment/attachment.js b/addons/mail/static/src/models/attachment/attachment.js index dde797d3689..9d6b19e4fad 100644 --- a/addons/mail/static/src/models/attachment/attachment.js +++ b/addons/mail/static/src/models/attachment/attachment.js @@ -306,7 +306,7 @@ registerModel({ /** * States on which composer this attachment is currently being created. */ - composer: many2one('mail.composer', { + composer: many2one('Composer', { inverse: 'attachments', }), defaultSource: attr({ diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js index a0c1d0f69a8..b9d391ff6d4 100644 --- a/addons/mail/static/src/models/composer/composer.js +++ b/addons/mail/static/src/models/composer/composer.js @@ -5,7 +5,7 @@ import { attr, many2many, many2one, one2many, one2one } from '@mail/model/model_ import { clear, replace, unlink } from '@mail/model/model_field_command'; registerModel({ - name: 'mail.composer', + name: 'Composer', identifyingFields: [['thread', 'messageViewInEditing']], recordMethods: { /** 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 eb28afd2277..cc85b8b7837 100644 --- a/addons/mail/static/src/models/composer_view/composer_view.js +++ b/addons/mail/static/src/models/composer_view/composer_view.js @@ -869,7 +869,7 @@ registerModel({ /** * States the composer state that is displayed by this composer view. */ - composer: many2one('mail.composer', { + composer: many2one('Composer', { compute: '_computeComposer', inverse: 'composerViews', required: true, diff --git a/addons/mail/static/src/models/message_view/message_view.js b/addons/mail/static/src/models/message_view/message_view.js index 6811428f9d9..b7b2cff05c1 100644 --- a/addons/mail/static/src/models/message_view/message_view.js +++ b/addons/mail/static/src/models/message_view/message_view.js @@ -119,7 +119,7 @@ registerModel({ * States the component displaying this message view (if any). */ component: attr(), - composerForEditing: one2one('mail.composer', { + composerForEditing: one2one('Composer', { inverse: 'messageViewInEditing', isCausal: true, }), diff --git a/addons/mail/static/src/models/thread/thread.js b/addons/mail/static/src/models/thread/thread.js index dfc9ce91739..2b8eb1a47cb 100644 --- a/addons/mail/static/src/models/thread/thread.js +++ b/addons/mail/static/src/models/thread/thread.js @@ -1950,7 +1950,7 @@ registerModel({ /** * Determines the composer state of this thread. */ - composer: one2one('mail.composer', { + composer: one2one('Composer', { compute: '_computeComposer', inverse: 'thread', isCausal: true, diff --git a/addons/mail/static/tests/qunit_test.js b/addons/mail/static/tests/qunit_test.js index 7922e446338..9bd42c066f3 100644 --- a/addons/mail/static/tests/qunit_test.js +++ b/addons/mail/static/tests/qunit_test.js @@ -7,7 +7,7 @@ registerModel({ name: 'mail.qunit_test', identifyingFields: [], // singleton acceptable (only one test at a time) fields: { - composer: one2one('mail.composer', { + composer: one2one('Composer', { isCausal: true, }), composerView: one2one('ComposerView', {