From e8552668f033e9947df55dc0aaeab79c5d3d81d7 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Tue, 14 Dec 2021 11:10:38 +0000 Subject: [PATCH] [IMP] mail: rename messaging menu model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.messaging_menu` to `MessagingMenu` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81388 Signed-off-by: Alexandre Kühn (aku) --- .../static/src/components/messaging_menu/messaging_menu.js | 4 ++-- addons/mail/static/src/models/messaging/messaging.js | 2 +- .../mail/static/src/models/messaging_menu/messaging_menu.js | 2 +- addons/mail/static/src/models/thread/thread.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.js b/addons/mail/static/src/components/messaging_menu/messaging_menu.js index f183b4e2640..75949bed04e 100644 --- a/addons/mail/static/src/components/messaging_menu/messaging_menu.js +++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.js @@ -41,10 +41,10 @@ export class MessagingMenu extends Component { //-------------------------------------------------------------------------- /** - * @returns {mail.messaging_menu} + * @returns {MessagingMenu} */ get messagingMenu() { - return this.messaging && this.messaging.models['mail.messaging_menu'].get(this.props.localId); + return this.messaging && this.messaging.models['MessagingMenu'].get(this.props.localId); } /** diff --git a/addons/mail/static/src/models/messaging/messaging.js b/addons/mail/static/src/models/messaging/messaging.js index 97c6b6572d6..457812e5a5e 100644 --- a/addons/mail/static/src/models/messaging/messaging.js +++ b/addons/mail/static/src/models/messaging/messaging.js @@ -328,7 +328,7 @@ registerModel({ readonly: true, required: true, }), - messagingMenu: one2one('mail.messaging_menu', { + messagingMenu: one2one('MessagingMenu', { default: insertAndReplace(), isCausal: true, readonly: true, diff --git a/addons/mail/static/src/models/messaging_menu/messaging_menu.js b/addons/mail/static/src/models/messaging_menu/messaging_menu.js index ebd9f7ac6e1..99396eb68f9 100644 --- a/addons/mail/static/src/models/messaging_menu/messaging_menu.js +++ b/addons/mail/static/src/models/messaging_menu/messaging_menu.js @@ -4,7 +4,7 @@ import { registerModel } from '@mail/model/model_core'; import { attr, one2many } from '@mail/model/model_field'; registerModel({ - name: 'mail.messaging_menu', + name: 'MessagingMenu', identifyingFields: ['messaging'], recordMethods: { /** diff --git a/addons/mail/static/src/models/thread/thread.js b/addons/mail/static/src/models/thread/thread.js index 3de9ca28f11..53ffdb6f4ff 100644 --- a/addons/mail/static/src/models/thread/thread.js +++ b/addons/mail/static/src/models/thread/thread.js @@ -2228,7 +2228,7 @@ registerModel({ inverse: 'ringingThreads', readonly: true, }), - messagingMenuAsPinnedAndUnreadChannel: many2one('mail.messaging_menu', { + messagingMenuAsPinnedAndUnreadChannel: many2one('MessagingMenu', { compute: '_computeMessagingMenuAsPinnedAndUnreadChannel', inverse: 'pinnedAndUnreadChannels', readonly: true,