From 42a458f144b3c2886f6bf9103e2e18049dce9c56 Mon Sep 17 00:00:00 2001 From: Adrien Dieudonne Date: Fri, 26 May 2023 12:15:15 +0000 Subject: [PATCH] [FIX] web, *: x2many list horizontal overflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up of https://github.com/odoo/odoo/pull/121468 Since https://github.com/odoo/odoo/commit/9f4622492c5cd84847368d32bf02b0b538a6dd69 (16.2), ´additionalClasses´ has to be added on the field instead of the component. closes odoo/odoo#122963 X-original-commit: 82228e65b59427d536f10970cd85610136347ff8 Signed-off-by: Michaël Mattiello (mcm) --- .../section_and_note_fields_backend.js | 2 +- .../mrp/static/src/widgets/mrp_production_components_x2many.js | 2 +- addons/resource/static/src/section_one2many_field.js | 2 +- .../stock/static/src/views/picking_form/stock_move_one2many.js | 2 +- .../static/src/question_page/question_page_one2many_field.js | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/account/static/src/components/section_and_note_fields_backend/section_and_note_fields_backend.js b/addons/account/static/src/components/section_and_note_fields_backend/section_and_note_fields_backend.js index 419ff867a83..d5f90c4e5c2 100644 --- a/addons/account/static/src/components/section_and_note_fields_backend/section_and_note_fields_backend.js +++ b/addons/account/static/src/components/section_and_note_fields_backend/section_and_note_fields_backend.js @@ -71,7 +71,6 @@ export class SectionAndNoteListRenderer extends ListRenderer { SectionAndNoteListRenderer.template = "account.sectionAndNoteListRenderer"; export class SectionAndNoteFieldOne2Many extends X2ManyField {} -SectionAndNoteFieldOne2Many.additionalClasses = ['o_field_one2many']; SectionAndNoteFieldOne2Many.components = { ...X2ManyField.components, ListRenderer: SectionAndNoteListRenderer, @@ -95,6 +94,7 @@ export class ListSectionAndNoteText extends SectionAndNoteText { export const sectionAndNoteFieldOne2Many = { ...x2ManyField, component: SectionAndNoteFieldOne2Many, + additionalClasses: [...x2ManyField.additionalClasses || [], "o_field_one2many"], }; export const sectionAndNoteText = { diff --git a/addons/mrp/static/src/widgets/mrp_production_components_x2many.js b/addons/mrp/static/src/widgets/mrp_production_components_x2many.js index 841cf7e7e35..e414ce2c10e 100644 --- a/addons/mrp/static/src/widgets/mrp_production_components_x2many.js +++ b/addons/mrp/static/src/widgets/mrp_production_components_x2many.js @@ -19,11 +19,11 @@ MrpProductionComponentsX2ManyField.components = { ...X2ManyField.components, ListRenderer: MrpProductionComponentsListRenderer }; -MrpProductionComponentsX2ManyField.additionalClasses = ["o_field_many2many"]; export const mrpProductionComponentsX2ManyField = { ...x2ManyField, component: MrpProductionComponentsX2ManyField, + additionalClasses: [...x2ManyField.additionalClasses || [], "o_field_many2many"], }; registry.category("fields").add("mrp_production_components_x2many", mrpProductionComponentsX2ManyField); diff --git a/addons/resource/static/src/section_one2many_field.js b/addons/resource/static/src/section_one2many_field.js index bdcc909d448..a2b4fe4044f 100644 --- a/addons/resource/static/src/section_one2many_field.js +++ b/addons/resource/static/src/section_one2many_field.js @@ -13,9 +13,9 @@ SectionOneToManyField.defaultProps = { ...X2ManyField.defaultProps, editable: "bottom", }; -SectionOneToManyField.additionalClasses = ["o_field_one2many"]; registry.category("fields").add("section_one2many", { ...x2ManyField, component: SectionOneToManyField, + additionalClasses: [...x2ManyField.additionalClasses || [], "o_field_one2many"], }); diff --git a/addons/stock/static/src/views/picking_form/stock_move_one2many.js b/addons/stock/static/src/views/picking_form/stock_move_one2many.js index 757287eeb75..af2afacf7c6 100644 --- a/addons/stock/static/src/views/picking_form/stock_move_one2many.js +++ b/addons/stock/static/src/views/picking_form/stock_move_one2many.js @@ -29,11 +29,11 @@ MovesListRenderer.components = { ...ListRenderer.components, ViewButton: MoveVie export class StockMoveX2ManyField extends X2ManyField {} StockMoveX2ManyField.components = { ...X2ManyField.components, ListRenderer: MovesListRenderer }; -StockMoveX2ManyField.additionalClasses = ['o_field_one2many']; export const stockMoveX2ManyField = { ...x2ManyField, component: StockMoveX2ManyField, + additionalClasses: [...x2ManyField.additionalClasses || [], "o_field_one2many"], }; registry.category("fields").add("stock_move_one2many", stockMoveX2ManyField); diff --git a/addons/survey/static/src/question_page/question_page_one2many_field.js b/addons/survey/static/src/question_page/question_page_one2many_field.js index 9f3956720b4..93ef62b4723 100644 --- a/addons/survey/static/src/question_page/question_page_one2many_field.js +++ b/addons/survey/static/src/question_page/question_page_one2many_field.js @@ -126,11 +126,12 @@ QuestionPageOneToManyField.defaultProps = { ...X2ManyField.defaultProps, editable: "bottom", }; -QuestionPageOneToManyField.additionalClasses = ["o_field_one2many"]; export const questionPageOneToManyField = { ...x2ManyField, component: QuestionPageOneToManyField, + additionalClasses: [...x2ManyField.additionalClasses || [], "o_field_one2many"], + }; registry.category("fields").add("question_page_one2many", questionPageOneToManyField);