From 443cbc625c808dbc22b22d60822c0cb4b1b566cc Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Tue, 14 Dec 2021 10:37:25 +0000 Subject: [PATCH] [IMP] mail: rename message action list model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.message_action_list` to `MessageActionList` inorder to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81381 Signed-off-by: Alexandre Kühn (aku) --- .../delete_message_confirm_dialog.js | 4 ++-- .../components/message_action_list/message_action_list.js | 6 +++--- .../src/models/message_action_list/message_action_list.js | 2 +- addons/mail/static/src/models/message_view/message_view.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js b/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js index 7349d53bb79..fa90a198459 100644 --- a/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js +++ b/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js @@ -18,10 +18,10 @@ export class DeleteMessageConfirmDialog extends Component { } /** - * @returns {mail.message_action_list} + * @returns {MessageActionList} */ get messageActionList() { - return this.messaging && this.messaging.models['mail.message_action_list'].get(this.props.messageActionListLocalId); + return this.messaging && this.messaging.models['MessageActionList'].get(this.props.messageActionListLocalId); } } diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.js b/addons/mail/static/src/components/message_action_list/message_action_list.js index 8af884be10c..38c231438cf 100644 --- a/addons/mail/static/src/components/message_action_list/message_action_list.js +++ b/addons/mail/static/src/components/message_action_list/message_action_list.js @@ -12,15 +12,15 @@ export class MessageActionList extends Component { */ setup() { super.setup(); - useRefToModel({ fieldName: 'reactionPopoverRef', modelName: 'mail.message_action_list', propNameAsRecordLocalId: 'messageActionListLocalId', refName: 'reactionPopover' }); + useRefToModel({ fieldName: 'reactionPopoverRef', modelName: 'MessageActionList', propNameAsRecordLocalId: 'messageActionListLocalId', refName: 'reactionPopover' }); this.ADD_A_REACTION = this.env._t("Add a Reaction"); } /** - * @returns {mail.message} + * @returns {MessageActionList} */ get messageActionList() { - return this.messaging && this.messaging.models['mail.message_action_list'].get(this.props.messageActionListLocalId); + return this.messaging && this.messaging.models['MessageActionList'].get(this.props.messageActionListLocalId); } } diff --git a/addons/mail/static/src/models/message_action_list/message_action_list.js b/addons/mail/static/src/models/message_action_list/message_action_list.js index 0322c3572ad..a60477b541b 100644 --- a/addons/mail/static/src/models/message_action_list/message_action_list.js +++ b/addons/mail/static/src/models/message_action_list/message_action_list.js @@ -6,7 +6,7 @@ import { clear, insertAndReplace, replace } from '@mail/model/model_field_comman import { markEventHandled } from '@mail/utils/utils'; registerModel({ - name: 'mail.message_action_list', + name: 'MessageActionList', identifyingFields: ['messageView'], lifecycleHooks: { _created() { 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 5c2fcd1f975..c701f816ca2 100644 --- a/addons/mail/static/src/models/message_view/message_view.js +++ b/addons/mail/static/src/models/message_view/message_view.js @@ -148,7 +148,7 @@ registerModel({ /** * Determines the message action list of this message view (if any). */ - messageActionList: one2one('mail.message_action_list', { + messageActionList: one2one('MessageActionList', { compute: '_computeMessageActionList', inverse: 'messageView', isCausal: true, @@ -158,7 +158,7 @@ registerModel({ * States the message action list that is displaying this message view * in its delete confirmation view. */ - messageActionListWithDelete: one2one('mail.message_action_list', { + messageActionListWithDelete: one2one('MessageActionList', { inverse: 'messageViewForDelete', isCausal: true, readonly: true,