From ba097f69e190141cbb0bf97af763adda355e45a8 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 13 Dec 2021 15:25:42 +0000 Subject: [PATCH] [IMP] mail: rename discuss public view model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.discuss_public_view` to `DiscussPublicView` inorder to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81346 Signed-off-by: Sébastien Theys (seb) --- .../src/components/discuss_public_view/discuss_public_view.js | 4 ++-- .../src/models/discuss_public_view/discuss_public_view.js | 2 +- addons/mail/static/src/models/thread_view/thread_viewer.js | 2 +- addons/mail/static/src/models/welcome_view/welcome_view.js | 2 +- addons/mail/static/src/public/discuss_public_boot.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js index 1cb71c313b8..c4f8a6f1454 100644 --- a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js +++ b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js @@ -7,10 +7,10 @@ const { Component } = owl; class DiscussPublicView extends Component { /** - * @returns {mail.discuss_public_view} + * @returns {DiscussPublicView} */ get discussPublicView() { - return this.messaging && this.messaging.models['mail.discuss_public_view'].get(this.props.localId); + return this.messaging && this.messaging.models['DiscussPublicView'].get(this.props.localId); } } diff --git a/addons/mail/static/src/models/discuss_public_view/discuss_public_view.js b/addons/mail/static/src/models/discuss_public_view/discuss_public_view.js index 37cb754719c..545558838e1 100644 --- a/addons/mail/static/src/models/discuss_public_view/discuss_public_view.js +++ b/addons/mail/static/src/models/discuss_public_view/discuss_public_view.js @@ -5,7 +5,7 @@ import { registerModel } from '@mail/model/model_core'; import { clear, insertAndReplace, link } from '@mail/model/model_field_command'; registerModel({ - name: 'mail.discuss_public_view', + name: 'DiscussPublicView', identifyingFields: ['messaging'], recordMethods: { /** diff --git a/addons/mail/static/src/models/thread_view/thread_viewer.js b/addons/mail/static/src/models/thread_view/thread_viewer.js index c9ac78978f5..0569f8e556b 100644 --- a/addons/mail/static/src/models/thread_view/thread_viewer.js +++ b/addons/mail/static/src/models/thread_view/thread_viewer.js @@ -77,7 +77,7 @@ registerModel({ inverse: 'threadViewer', readonly: true, }), - discussPublicView: one2one('mail.discuss_public_view', { + discussPublicView: one2one('DiscussPublicView', { inverse: 'threadViewer', readonly: true, }), diff --git a/addons/mail/static/src/models/welcome_view/welcome_view.js b/addons/mail/static/src/models/welcome_view/welcome_view.js index ace106dda9d..831f8854169 100644 --- a/addons/mail/static/src/models/welcome_view/welcome_view.js +++ b/addons/mail/static/src/models/welcome_view/welcome_view.js @@ -143,7 +143,7 @@ registerModel({ /** * States discuss public view on which this welcome view is displayed. */ - discussPublicView: one2one('mail.discuss_public_view', { + discussPublicView: one2one('DiscussPublicView', { inverse: 'welcomeView', readonly: true, required: true, diff --git a/addons/mail/static/src/public/discuss_public_boot.js b/addons/mail/static/src/public/discuss_public_boot.js index 135225df538..ce76e68ed68 100644 --- a/addons/mail/static/src/public/discuss_public_boot.js +++ b/addons/mail/static/src/public/discuss_public_boot.js @@ -71,7 +71,7 @@ async function createAndMountDiscussPublicView() { const dialogManagerComponent = new DialogManager(null, {}); await dialogManagerComponent.mount(document.body); messaging.models['mail.thread'].insert(messaging.models['mail.thread'].convertData(data.channelData)); - const discussPublicView = messaging.models['mail.discuss_public_view'].create(data.discussPublicViewData); + const discussPublicView = messaging.models['DiscussPublicView'].create(data.discussPublicViewData); if (discussPublicView.shouldDisplayWelcomeViewInitially) { discussPublicView.switchToWelcomeView(); } else {