From 08e34b4ca90e15acf4e6a94148dd503efdddaaa2 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 13 Dec 2021 13:55:44 +0000 Subject: [PATCH] [IMP] mail: rename attachment list model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.attachment_list` to `AttachmentList` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81316 Signed-off-by: Sébastien Theys (seb) --- .../static/src/components/attachment_list/attachment_list.js | 4 ++-- addons/mail/static/src/models/attachment/attachment.js | 2 +- .../mail/static/src/models/attachment_card/attachment_card.js | 2 +- .../static/src/models/attachment_image/attachment_image.js | 2 +- .../mail/static/src/models/attachment_list/attachment_list.js | 2 +- .../static/src/models/attachment_viewer/attachment_viewer.js | 2 +- addons/mail/static/src/models/chatter/chatter.js | 2 +- addons/mail/static/src/models/composer_view/composer_view.js | 2 +- addons/mail/static/src/models/message_view/message_view.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/mail/static/src/components/attachment_list/attachment_list.js b/addons/mail/static/src/components/attachment_list/attachment_list.js index 0a31361f90d..c91230c3db2 100644 --- a/addons/mail/static/src/components/attachment_list/attachment_list.js +++ b/addons/mail/static/src/components/attachment_list/attachment_list.js @@ -7,10 +7,10 @@ const { Component } = owl; export class AttachmentList extends Component { /** - * @returns {mail.attachment_list} + * @returns {AttachmentList} */ get attachmentList() { - return this.messaging && this.messaging.models['mail.attachment_list'].get(this.props.attachmentListLocalId); + return this.messaging && this.messaging.models['AttachmentList'].get(this.props.attachmentListLocalId); } } diff --git a/addons/mail/static/src/models/attachment/attachment.js b/addons/mail/static/src/models/attachment/attachment.js index 4daa8346bcc..dde797d3689 100644 --- a/addons/mail/static/src/models/attachment/attachment.js +++ b/addons/mail/static/src/models/attachment/attachment.js @@ -296,7 +296,7 @@ registerModel({ /** * States the attachment lists that are displaying this attachment. */ - attachmentLists: many2many('mail.attachment_list', { + attachmentLists: many2many('AttachmentList', { inverse: 'attachments', }), attachmentViewer: many2many('AttachmentViewer', { diff --git a/addons/mail/static/src/models/attachment_card/attachment_card.js b/addons/mail/static/src/models/attachment_card/attachment_card.js index df6296ea01a..588e3c01b23 100644 --- a/addons/mail/static/src/models/attachment_card/attachment_card.js +++ b/addons/mail/static/src/models/attachment_card/attachment_card.js @@ -73,7 +73,7 @@ registerModel({ /** * States the attachmentList displaying this card. */ - attachmentList: many2one('mail.attachment_list', { + attachmentList: many2one('AttachmentList', { inverse: 'attachmentCards', readonly: true, required: true, diff --git a/addons/mail/static/src/models/attachment_image/attachment_image.js b/addons/mail/static/src/models/attachment_image/attachment_image.js index d6ef0539fb7..1e57b7f5f9f 100644 --- a/addons/mail/static/src/models/attachment_image/attachment_image.js +++ b/addons/mail/static/src/models/attachment_image/attachment_image.js @@ -115,7 +115,7 @@ registerModel({ /** * States the attachmentList displaying this attachment image. */ - attachmentList: many2one('mail.attachment_list', { + attachmentList: many2one('AttachmentList', { inverse: 'attachmentImages', readonly: true, required: true, diff --git a/addons/mail/static/src/models/attachment_list/attachment_list.js b/addons/mail/static/src/models/attachment_list/attachment_list.js index 0f206efc870..d76e56dfa42 100644 --- a/addons/mail/static/src/models/attachment_list/attachment_list.js +++ b/addons/mail/static/src/models/attachment_list/attachment_list.js @@ -5,7 +5,7 @@ import { many2many, many2one, one2many, one2one } from '@mail/model/model_field' import { clear, insertAndReplace, replace } from '@mail/model/model_field_command'; registerModel({ - name: 'mail.attachment_list', + name: 'AttachmentList', identifyingFields: [['composerView', 'messageView', 'chatter']], recordMethods: { _computeAttachmentImages() { diff --git a/addons/mail/static/src/models/attachment_viewer/attachment_viewer.js b/addons/mail/static/src/models/attachment_viewer/attachment_viewer.js index f14621d8399..112e3eae3d8 100644 --- a/addons/mail/static/src/models/attachment_viewer/attachment_viewer.js +++ b/addons/mail/static/src/models/attachment_viewer/attachment_viewer.js @@ -39,7 +39,7 @@ registerModel({ default: 0, }), attachment: many2one('mail.attachment'), - attachmentList: many2one('mail.attachment_list', { + attachmentList: many2one('AttachmentList', { inverse: 'attachmentViewer', readonly: true, required: true, diff --git a/addons/mail/static/src/models/chatter/chatter.js b/addons/mail/static/src/models/chatter/chatter.js index 12d9d2a6723..af9d8930a0e 100644 --- a/addons/mail/static/src/models/chatter/chatter.js +++ b/addons/mail/static/src/models/chatter/chatter.js @@ -289,7 +289,7 @@ registerModel({ /** * Determines the attachment list that will be used to display the attachments. */ - attachmentList: one2one('mail.attachment_list', { + attachmentList: one2one('AttachmentList', { compute: '_computeAttachmentList', inverse: 'chatter', isCausal: true, 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 84db7455b5e..687ba47956d 100644 --- a/addons/mail/static/src/models/composer_view/composer_view.js +++ b/addons/mail/static/src/models/composer_view/composer_view.js @@ -853,7 +853,7 @@ registerModel({ /** * Determines the attachment list that will be used to display the attachments. */ - attachmentList: one2one('mail.attachment_list', { + attachmentList: one2one('AttachmentList', { compute: '_computeAttachmentList', inverse: 'composerView', isCausal: 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 f8afdfe3302..5c2fcd1f975 100644 --- a/addons/mail/static/src/models/message_view/message_view.js +++ b/addons/mail/static/src/models/message_view/message_view.js @@ -109,7 +109,7 @@ registerModel({ * Determines the attachment list displaying the attachments of this * message (if any). */ - attachmentList: one2one('mail.attachment_list', { + attachmentList: one2one('AttachmentList', { compute: '_computeAttachmentList', inverse: 'messageView', isCausal: true,