[IMP] mail: rename user model

Rename javascript model mail.user to User in order to distinguish
javascript models from python models.

Task-2701674

closes odoo/odoo#81471

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
This commit is contained in:
Alexandre Kühn
2021-12-15 15:50:44 +00:00
parent 3c5714ba9a
commit b2d2b78fbc
7 changed files with 13 additions and 13 deletions
@@ -168,7 +168,7 @@ registerModel({
/**
* User related to this employee.
*/
user: one2one('mail.user', {
user: one2one('User', {
inverse: 'employee',
}),
},
+1 -1
View File
@@ -5,7 +5,7 @@ import { one2one } from '@mail/model/model_field';
// ensure that the model definition is loaded before the patch
import '@mail/models/user/user';
addFields('mail.user', {
addFields('User', {
/**
* Employee related to this user.
*/
@@ -232,7 +232,7 @@ registerModel({
},
},
fields: {
assignee: many2one('mail.user'),
assignee: many2one('User'),
attachments: many2many('mail.attachment', {
inverse: 'activities',
}),
@@ -240,7 +240,7 @@ registerModel({
default: false,
}),
category: attr(),
creator: many2one('mail.user'),
creator: many2one('User'),
dateCreate: attr(),
dateDeadline: attr(),
/**
@@ -49,7 +49,7 @@ registerModel({
*/
async getChat({ partnerId, userId }) {
if (userId) {
const user = this.messaging.models['mail.user'].insert({ id: userId });
const user = this.messaging.models['User'].insert({ id: userId });
return user.getChat();
}
if (partnerId) {
@@ -110,7 +110,7 @@ registerModel({
return partner.openProfile();
}
if (model === 'res.users') {
const user = this.messaging.models['mail.user'].insert({ id });
const user = this.messaging.models['User'].insert({ id });
return user.openProfile();
}
if (model === 'mail.channel') {
@@ -242,7 +242,7 @@ registerModel({
companyName: attr(),
currentGuest: one2one('Guest'),
currentPartner: one2one('Partner'),
currentUser: one2one('mail.user'),
currentUser: one2one('User'),
device: one2one('Device', {
default: insertAndReplace(),
isCausal: true,
@@ -453,7 +453,7 @@ registerModel({
rtcSessions: one2many('RtcSession', {
inverse: 'partner',
}),
user: one2one('mail.user', {
user: one2one('User', {
inverse: 'partner',
}),
volumeSetting: one2one('mail.volume_setting', {
@@ -1962,7 +1962,7 @@ registerModel({
counter: attr({
default: 0,
}),
creator: many2one('mail.user'),
creator: many2one('User'),
custom_channel_name: attr(),
/**
* Determines the default display mode of this channel. Should contain
+4 -4
View File
@@ -5,7 +5,7 @@ import { attr, one2one } from '@mail/model/model_field';
import { insert, unlink } from '@mail/model/model_field_command';
registerModel({
name: 'mail.user',
name: 'User',
identifyingFields: ['id'],
modelMethods: {
/**
@@ -49,8 +49,8 @@ registerModel({
fields,
},
}, { shadow: true });
return this.messaging.models['mail.user'].insert(usersData.map(userData =>
this.messaging.models['mail.user'].convertData(userData)
return this.messaging.models['User'].insert(usersData.map(userData =>
this.messaging.models['User'].convertData(userData)
));
},
},
@@ -59,7 +59,7 @@ registerModel({
* Fetches the partner of this user.
*/
async fetchPartner() {
return this.messaging.models['mail.user'].performRpcRead({
return this.messaging.models['User'].performRpcRead({
ids: [this.id],
fields: ['partner_id'],
context: { active_test: false },