From 276259d0ee81f21d5198ec2ecfac5164f397d96d Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 11 Mar 2022 12:14:40 +0100 Subject: [PATCH] [FIX] web_widget_x2many_2d_matrix: make the possibility to have alternative values for headers of rows and columns working --- .../static/src/js/2d_matrix_renderer.js | 2 +- .../static/src/js/widget_x2many_2d_matrix.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js index 3d0d824e8..85374a5fc 100644 --- a/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js +++ b/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js @@ -223,7 +223,7 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function (requ */ _renderLabelCell: function (record) { var $td = $(""); - var value = record.data[this.matrix_data.field_y_axis]; + var value = record.data[this.matrix_data.field_label_y_axis]; if (value.type === "record") { // We have a related record value = value.data.display_name; diff --git a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js index 118206925..0f3740603 100644 --- a/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js +++ b/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js @@ -88,8 +88,8 @@ odoo.define("web_widget_x2many_2d_matrix.widget", function (require) { _.each( records, function (record) { - var x = record.data[this.field_x_axis], - y = record.data[this.field_y_axis]; + var x = record.data[this.field_label_x_axis], + y = record.data[this.field_label_y_axis]; if (x.type === "record") { // We have a related record x = x.data.display_name; @@ -127,6 +127,8 @@ odoo.define("web_widget_x2many_2d_matrix.widget", function (require) { field_value: this.field_value, field_x_axis: this.field_x_axis, field_y_axis: this.field_y_axis, + field_label_x_axis: this.field_label_x_axis, + field_label_y_axis: this.field_label_y_axis, columns: this.columns, rows: this.rows, show_row_totals: this.show_row_totals,