From e4eeff3d4f97b8d59d74f853356bfbf398d8c16a Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Tue, 14 Dec 2021 12:03:45 +0000 Subject: [PATCH] [IMP] mail: rename popover view model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.popover_view` to `PopoverView` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81407 Signed-off-by: Alexandre Kühn (aku) --- .../mail/static/src/components/popover_view/popover_view.js | 6 +++--- .../channel_invitation_form/channel_invitation_form.js | 2 +- addons/mail/static/src/models/popover_view/popover_view.js | 2 +- .../src/models/thread_view_topbar/thread_view_topbar.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/mail/static/src/components/popover_view/popover_view.js b/addons/mail/static/src/components/popover_view/popover_view.js index e8cc8a73634..86f035d5e8d 100644 --- a/addons/mail/static/src/components/popover_view/popover_view.js +++ b/addons/mail/static/src/components/popover_view/popover_view.js @@ -14,7 +14,7 @@ export class PopoverView extends Component { */ setup() { super.setup(); - useComponentToModel({ fieldName: 'component', modelName: 'mail.popover_view', propNameAsRecordLocalId: 'popoverViewLocalId' }); + useComponentToModel({ fieldName: 'component', modelName: 'PopoverView', propNameAsRecordLocalId: 'popoverViewLocalId' }); usePosition( () => this.popoverView && this.popoverView.anchorRef && this.popoverView.anchorRef.el, { @@ -29,10 +29,10 @@ export class PopoverView extends Component { //-------------------------------------------------------------------------- /** - * @returns {mail.popover_view|undefined} + * @returns {PopoverView|undefined} */ get popoverView() { - return this.messaging && this.messaging.models['mail.popover_view'].get(this.props.popoverViewLocalId); + return this.messaging && this.messaging.models['PopoverView'].get(this.props.popoverViewLocalId); } } diff --git a/addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js b/addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js index 3a019dc0a62..122b28b9492 100644 --- a/addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js +++ b/addons/mail/static/src/models/channel_invitation_form/channel_invitation_form.js @@ -210,7 +210,7 @@ registerModel({ inviteButtonText: attr({ compute: '_computeInviteButtonText', }), - popoverView: one2one('mail.popover_view', { + popoverView: one2one('PopoverView', { inverse: 'channelInvitationForm', isCausal: true, }), diff --git a/addons/mail/static/src/models/popover_view/popover_view.js b/addons/mail/static/src/models/popover_view/popover_view.js index 8097b38ab5f..c5a46610d12 100644 --- a/addons/mail/static/src/models/popover_view/popover_view.js +++ b/addons/mail/static/src/models/popover_view/popover_view.js @@ -5,7 +5,7 @@ import { attr, one2one } from '@mail/model/model_field'; import { clear } from '@mail/model/model_field_command'; registerModel({ - name: 'mail.popover_view', + name: 'PopoverView', identifyingFields: ['threadViewTopbarOwner', 'channelInvitationForm'], lifecycleHooks: { _created() { diff --git a/addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js b/addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js index 79a5439929b..a888f6ce685 100644 --- a/addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js +++ b/addons/mail/static/src/models/thread_view_topbar/thread_view_topbar.js @@ -591,7 +591,7 @@ registerModel({ * If set, this is the record of invite button popover that is currently * open in the topbar. */ - invitePopoverView: one2one('mail.popover_view', { + invitePopoverView: one2one('PopoverView', { isCausal: true, inverse: 'threadViewTopbarOwner', }),