From d535acf459668457d190ece69a30886241248cd1 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 13 Dec 2021 17:15:35 +0000 Subject: [PATCH] [IMP] mail: rename follower subtype model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model `mail.follower_subtype` to `FollowerSubtype` in order to distinguish javascript models from python models. Part of task-2701674. closes odoo/odoo#81370 Signed-off-by: Alexandre Kühn (aku) --- .../components/follower_subtype/follower_subtype.js | 4 ++-- .../follower_subtype/tests/follower_subtype_tests.js | 6 +++--- addons/mail/static/src/models/follower/follower.js | 12 ++++++------ .../src/models/follower_subtype/follower_subtype.js | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/mail/static/src/components/follower_subtype/follower_subtype.js b/addons/mail/static/src/components/follower_subtype/follower_subtype.js index 29fcf6ff442..ceace87c04d 100644 --- a/addons/mail/static/src/components/follower_subtype/follower_subtype.js +++ b/addons/mail/static/src/components/follower_subtype/follower_subtype.js @@ -18,10 +18,10 @@ export class FollowerSubtype extends Component { } /** - * @returns {mail.follower_subtype} + * @returns {FollowerSubtype} */ get followerSubtype() { - return this.messaging && this.messaging.models['mail.follower_subtype'].get(this.props.followerSubtypeLocalId); + return this.messaging && this.messaging.models['FollowerSubtype'].get(this.props.followerSubtypeLocalId); } //-------------------------------------------------------------------------- diff --git a/addons/mail/static/src/components/follower_subtype/tests/follower_subtype_tests.js b/addons/mail/static/src/components/follower_subtype/tests/follower_subtype_tests.js index 5865c3381a7..ad2cfe5935b 100644 --- a/addons/mail/static/src/components/follower_subtype/tests/follower_subtype_tests.js +++ b/addons/mail/static/src/components/follower_subtype/tests/follower_subtype_tests.js @@ -59,7 +59,7 @@ QUnit.test('simplest layout of a followed subtype', async function (assert) { isActive: true, isEditable: true, }); - const followerSubtype = this.messaging.models['mail.follower_subtype'].create({ + const followerSubtype = this.messaging.models['FollowerSubtype'].create({ id: 1, isDefault: true, isInternal: false, @@ -119,7 +119,7 @@ QUnit.test('simplest layout of a not followed subtype', async function (assert) isActive: true, isEditable: true, }); - const followerSubtype = this.messaging.models['mail.follower_subtype'].create({ + const followerSubtype = this.messaging.models['FollowerSubtype'].create({ id: 1, isDefault: true, isInternal: false, @@ -176,7 +176,7 @@ QUnit.test('toggle follower subtype checkbox', async function (assert) { isActive: true, isEditable: true, }); - const followerSubtype = this.messaging.models['mail.follower_subtype'].create({ + const followerSubtype = this.messaging.models['FollowerSubtype'].create({ id: 1, isDefault: true, isInternal: false, diff --git a/addons/mail/static/src/models/follower/follower.js b/addons/mail/static/src/models/follower/follower.js index 6f7ae0adf93..1c7e330b95e 100644 --- a/addons/mail/static/src/models/follower/follower.js +++ b/addons/mail/static/src/models/follower/follower.js @@ -71,7 +71,7 @@ registerModel({ followedThread.fetchAndUpdateSuggestedRecipients(); }, /** - * @param {mail.follower_subtype} subtype + * @param {FollowerSubtype} subtype */ selectSubtype(subtype) { if (!this.selectedSubtypes.includes(subtype)) { @@ -88,8 +88,8 @@ registerModel({ })); this.update({ subtypes: unlinkAll() }); for (const data of subtypesData) { - const subtype = this.messaging.models['mail.follower_subtype'].insert( - this.messaging.models['mail.follower_subtype'].convertData(data) + const subtype = this.messaging.models['FollowerSubtype'].insert( + this.messaging.models['FollowerSubtype'].convertData(data) ); this.update({ subtypes: link(subtype) }); if (data.followed) { @@ -107,7 +107,7 @@ registerModel({ }); }, /** - * @param {mail.follower_subtype} subtype + * @param {FollowerSubtype} subtype */ unselectSubtype(subtype) { if (this.selectedSubtypes.includes(subtype)) { @@ -158,11 +158,11 @@ registerModel({ partner: many2one('mail.partner', { required: true, }), - selectedSubtypes: many2many('mail.follower_subtype'), + selectedSubtypes: many2many('FollowerSubtype'), subtypeList: one2many('mail.follower_subtype_list', { inverse: 'follower', isCausal: true, }), - subtypes: many2many('mail.follower_subtype'), + subtypes: many2many('FollowerSubtype'), }, }); diff --git a/addons/mail/static/src/models/follower_subtype/follower_subtype.js b/addons/mail/static/src/models/follower_subtype/follower_subtype.js index 99291ab6587..e05a01aadac 100644 --- a/addons/mail/static/src/models/follower_subtype/follower_subtype.js +++ b/addons/mail/static/src/models/follower_subtype/follower_subtype.js @@ -4,7 +4,7 @@ import { registerModel } from '@mail/model/model_core'; import { attr } from '@mail/model/model_field'; registerModel({ - name: 'mail.follower_subtype', + name: 'FollowerSubtype', identifyingFields: ['id'], modelMethods: { /**