From 5ce76d3af851bd6dce76f96838f3201a9e347fe1 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Mon, 29 Nov 2021 17:11:18 +0000 Subject: [PATCH] [IMP] hr: rename employee model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename javascript model 'hr.employee' to 'Employee' in order to distinguish javascript model from python model. Part of task-2701674. closes odoo/odoo#80561 Signed-off-by: Alexandre Kühn (aku) --- addons/hr/static/src/models/employee/employee.js | 12 ++++++------ addons/hr/static/src/models/messaging/messaging.js | 4 ++-- addons/hr/static/src/models/partner/partner.js | 4 ++-- addons/hr/static/src/models/user/user.js | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/hr/static/src/models/employee/employee.js b/addons/hr/static/src/models/employee/employee.js index 5c37022a3ba..eb6d842318a 100644 --- a/addons/hr/static/src/models/employee/employee.js +++ b/addons/hr/static/src/models/employee/employee.js @@ -5,7 +5,7 @@ import { attr, one2one } from '@mail/model/model_field'; import { insert, unlink } from '@mail/model/model_field_command'; registerModel({ - name: 'hr.employee', + name: 'Employee', identifyingFields: ['id'], modelMethods: { /** @@ -56,8 +56,8 @@ registerModel({ fields, }, }); - this.messaging.models['hr.employee'].insert(employeesData.map(employeeData => - this.messaging.models['hr.employee'].convertData(employeeData) + this.messaging.models['Employee'].insert(employeesData.map(employeeData => + this.messaging.models['Employee'].convertData(employeeData) )); }, /** @@ -78,8 +78,8 @@ registerModel({ fields, }, }); - this.messaging.models['hr.employee'].insert(employeesData.map(employeeData => - this.messaging.models['hr.employee'].convertData(employeeData) + this.messaging.models['Employee'].insert(employeesData.map(employeeData => + this.messaging.models['Employee'].convertData(employeeData) )); }, }, @@ -89,7 +89,7 @@ registerModel({ * them if applicable. */ async checkIsUser() { - return this.messaging.models['hr.employee'].performRpcRead({ + return this.messaging.models['Employee'].performRpcRead({ ids: [this.id], fields: ['user_id', 'user_partner_id'], context: { active_test: false }, diff --git a/addons/hr/static/src/models/messaging/messaging.js b/addons/hr/static/src/models/messaging/messaging.js index 4056fbf1c85..23937802afc 100644 --- a/addons/hr/static/src/models/messaging/messaging.js +++ b/addons/hr/static/src/models/messaging/messaging.js @@ -11,7 +11,7 @@ patchRecordMethods('Messaging', { */ async getChat({ employeeId }) { if (employeeId) { - const employee = this.messaging.models['hr.employee'].insert({ id: employeeId }); + const employee = this.messaging.models['Employee'].insert({ id: employeeId }); return employee.getChat(); } return this._super(...arguments); @@ -21,7 +21,7 @@ patchRecordMethods('Messaging', { */ async openProfile({ id, model }) { if (model === 'hr.employee' || model === 'hr.employee.public') { - const employee = this.messaging.models['hr.employee'].insert({ id }); + const employee = this.messaging.models['Employee'].insert({ id }); return employee.openProfile(); } return this._super(...arguments); diff --git a/addons/hr/static/src/models/partner/partner.js b/addons/hr/static/src/models/partner/partner.js index e0076e6c721..a896e6276a5 100644 --- a/addons/hr/static/src/models/partner/partner.js +++ b/addons/hr/static/src/models/partner/partner.js @@ -11,7 +11,7 @@ addRecordMethods('mail.partner', { * applicable. */ async checkIsEmployee() { - await this.async(() => this.messaging.models['hr.employee'].performRpcSearchRead({ + await this.async(() => this.messaging.models['Employee'].performRpcSearchRead({ context: { active_test: false }, domain: [['user_partner_id', '=', this.id]], fields: ['user_id', 'user_partner_id'], @@ -45,7 +45,7 @@ addFields('mail.partner', { * Employee related to this partner. It is computed through * the inverse relation and should be considered read-only. */ - employee: one2one('hr.employee', { + employee: one2one('Employee', { inverse: 'partner', }), /** diff --git a/addons/hr/static/src/models/user/user.js b/addons/hr/static/src/models/user/user.js index 4d7703b236f..f7f29cfdef7 100644 --- a/addons/hr/static/src/models/user/user.js +++ b/addons/hr/static/src/models/user/user.js @@ -9,7 +9,7 @@ addFields('mail.user', { /** * Employee related to this user. */ - employee: one2one('hr.employee', { + employee: one2one('Employee', { inverse: 'user', }), });