From 7936173c2760ea606fbb525747a2f08e39429230 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Tue, 30 Nov 2021 09:51:10 +0000 Subject: [PATCH] [IMP] mail: rename activity type model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model 'mail.activity_type' to 'ActivityType' in order to distinguish javascript model from python model. Part of task-2701674. closes odoo/odoo#80600 Signed-off-by: Sébastien Theys (seb) --- addons/mail/static/src/models/activity/activity.js | 2 +- addons/mail/static/src/models/activity_type/activity_type.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/models/activity/activity.js b/addons/mail/static/src/models/activity/activity.js index 091a5db4fe5..36334f00735 100644 --- a/addons/mail/static/src/models/activity/activity.js +++ b/addons/mail/static/src/models/activity/activity.js @@ -290,7 +290,7 @@ registerModel({ thread: many2one('mail.thread', { inverse: 'activities', }), - type: many2one('mail.activity_type', { + type: many2one('ActivityType', { inverse: 'activities', }), }, diff --git a/addons/mail/static/src/models/activity_type/activity_type.js b/addons/mail/static/src/models/activity_type/activity_type.js index 986f34e42c2..cd760321a04 100644 --- a/addons/mail/static/src/models/activity_type/activity_type.js +++ b/addons/mail/static/src/models/activity_type/activity_type.js @@ -4,7 +4,7 @@ import { registerModel } from '@mail/model/model_core'; import { attr, one2many } from '@mail/model/model_field'; registerModel({ - name: 'mail.activity_type', + name: 'ActivityType', identifyingFields: ['id'], fields: { activities: one2many('Activity', {