From 322a2135c6c2f23cfbaf5d3f152c74a2b8cef1cf Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Thu, 22 Sep 2022 14:51:43 +0000 Subject: [PATCH] [FIX] hr,mail: reintroduce legacy x2m_avatar widgets Some views still use them. closes odoo/odoo#101081 X-original-commit: adb5508afd2749dbbfeb85803d707df43358b011 Signed-off-by: William Braeckman (wbr) --- .../hr/static/src/js/m2x_avatar_employee.js | 7 ++++++ addons/mail/static/src/js/m2x_avatar_user.js | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/addons/hr/static/src/js/m2x_avatar_employee.js b/addons/hr/static/src/js/m2x_avatar_employee.js index 80ce9811faa..3c33366739c 100644 --- a/addons/hr/static/src/js/m2x_avatar_employee.js +++ b/addons/hr/static/src/js/m2x_avatar_employee.js @@ -4,7 +4,9 @@ import fieldRegistry from 'web.field_registry'; import { Many2OneAvatarUser, + KanbanMany2OneAvatarUser, KanbanMany2ManyAvatarUser, + ListMany2ManyAvatarUser, Many2ManyAvatarUser, } from '@mail/js/m2x_avatar_user'; @@ -42,8 +44,10 @@ const M2XAvatarEmployeeMixin = { }; export const Many2OneAvatarEmployee = Many2OneAvatarUser.extend(M2XAvatarEmployeeMixin); +export const KanbanMany2OneAvatarEmployee = KanbanMany2OneAvatarUser.extend(M2XAvatarEmployeeMixin); fieldRegistry.add('many2one_avatar_employee', Many2OneAvatarEmployee); +fieldRegistry.add('kanban.many2one_avatar_employee', KanbanMany2OneAvatarEmployee); const M2MAvatarEmployeeMixin = Object.assign(M2XAvatarEmployeeMixin, { //---------------------------------------------------------------------- @@ -59,8 +63,11 @@ export const Many2ManyAvatarEmployee = Many2ManyAvatarUser.extend(M2MAvatarEmplo export const KanbanMany2ManyAvatarEmployee = KanbanMany2ManyAvatarUser.extend(M2MAvatarEmployeeMixin, {}); +export const ListMany2ManyAvatarEmployee = ListMany2ManyAvatarUser.extend(M2MAvatarEmployeeMixin, {}); + fieldRegistry.add('many2many_avatar_employee', Many2ManyAvatarEmployee); fieldRegistry.add('kanban.many2many_avatar_employee', KanbanMany2ManyAvatarEmployee); +fieldRegistry.add('list.many2many_avatar_employee', ListMany2ManyAvatarEmployee); export default { Many2OneAvatarEmployee, diff --git a/addons/mail/static/src/js/m2x_avatar_user.js b/addons/mail/static/src/js/m2x_avatar_user.js index c1502cf2e94..500482240b0 100644 --- a/addons/mail/static/src/js/m2x_avatar_user.js +++ b/addons/mail/static/src/js/m2x_avatar_user.js @@ -2,7 +2,7 @@ import core from 'web.core'; import fieldRegistry from 'web.field_registry'; -import { FieldMany2ManyTagsAvatar, Many2OneAvatar, KanbanMany2ManyTagsAvatar } from 'web.relational_fields'; +import { FieldMany2ManyTagsAvatar, KanbanMany2ManyTagsAvatar, ListMany2ManyTagsAvatar, Many2OneAvatar } from 'web.relational_fields'; import session from 'web.session'; const { Component } = owl; @@ -191,6 +191,15 @@ export const Many2OneAvatarUser = Many2OneAvatar.extend(M2XAvatarMixin, { } }); +export const KanbanMany2OneAvatarUser = Many2OneAvatarUser.extend({ + _template: 'mail.KanbanMany2OneAvatarUser', + + init() { + this._super(...arguments); + this.displayAvatarName = this.nodeOptions.display_avatar_name || false; + }, +}); + const M2MAvatarMixin = Object.assign(M2XAvatarMixin, { events: Object.assign({}, FieldMany2ManyTagsAvatar.prototype.events, { 'click .o_m2m_avatar': '_onAvatarClicked', @@ -318,16 +327,13 @@ export const Many2ManyAvatarUser = FieldMany2ManyTagsAvatar.extend(M2MAvatarMixi } }); -export const KanbanMany2OneAvatarUser = Many2OneAvatarUser.extend({ - _template: 'mail.KanbanMany2OneAvatarUser', - - init() { - this._super(...arguments); - this.displayAvatarName = this.nodeOptions.display_avatar_name || false; - }, -}); export const KanbanMany2ManyAvatarUser = KanbanMany2ManyTagsAvatar.extend(M2MAvatarMixin, {}); +export const ListMany2ManyAvatarUser = ListMany2ManyTagsAvatar.extend(M2MAvatarMixin, {}); + fieldRegistry.add('many2one_avatar_user', Many2OneAvatarUser); +fieldRegistry.add('kanban.many2one_avatar_user', KanbanMany2OneAvatarUser); fieldRegistry.add('activity.many2one_avatar_user', KanbanMany2OneAvatarUser); fieldRegistry.add('many2many_avatar_user', Many2ManyAvatarUser); +fieldRegistry.add('kanban.many2many_avatar_user', KanbanMany2ManyAvatarUser); +fieldRegistry.add('list.many2many_avatar_user', ListMany2ManyAvatarUser);