audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_widget_x2many_2d_matrix: make the possibility to have alternative values for headers of rows and columns working

Browse Source
This commit is contained in:
Sylvain LE GAL
2022-03-11 12:14:40 +01:00
committed by Vincent Hatakeyama
parent 8b6c1aaef6
commit 58bbdda57c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
View File

@@ -223,7 +223,7 @@ odoo.define("web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer", function (requ
*/ */
_renderLabelCell: function (record) { _renderLabelCell: function (record) {
var $td = $("<td>"); var $td = $("<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") { if (value.type === "record") {
// We have a related record // We have a related record
value = value.data.display_name; value = value.data.display_name;

6
web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js
View File

@@ -88,8 +88,8 @@ odoo.define("web_widget_x2many_2d_matrix.widget", function (require) {
_.each( _.each(
records, records,
function (record) { function (record) {
var x = record.data[this.field_x_axis], var x = record.data[this.field_label_x_axis],
y = record.data[this.field_y_axis]; y = record.data[this.field_label_y_axis];
if (x.type === "record") { if (x.type === "record") {
// We have a related record // We have a related record
x = x.data.display_name; 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_value: this.field_value,
field_x_axis: this.field_x_axis, field_x_axis: this.field_x_axis,
field_y_axis: this.field_y_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, columns: this.columns,
rows: this.rows, rows: this.rows,
show_row_totals: this.show_row_totals, show_row_totals: this.show_row_totals,