From c90a414c93d9689256d3c6071cc15b4fd0cb8567 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Tue, 7 Aug 2018 18:18:37 +0200 Subject: [PATCH] web_widget_x2many_matrix: fix issue with limit of records --- web_widget_x2many_2d_matrix/__manifest__.py | 2 +- .../static/src/js/2d_matrix_renderer.js | 2 +- .../src/js/abstract_view_matrix_limit_extend.js | 17 +++++++++++++++++ web_widget_x2many_2d_matrix/views/assets.xml | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js diff --git a/web_widget_x2many_2d_matrix/__manifest__.py b/web_widget_x2many_2d_matrix/__manifest__.py index e0d80115..30d7a730 100644 --- a/web_widget_x2many_2d_matrix/__manifest__.py +++ b/web_widget_x2many_2d_matrix/__manifest__.py @@ -4,7 +4,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "2D matrix for x2many fields", - "version": "11.0.1.1.0", + "version": "11.0.1.1.1", "author": "Therp BV, " "Tecnativa, " "Camptocamp, " 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 6b9d6665..ac627e44 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 @@ -319,7 +319,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ * @private * @returns {jQueryElement} The td element with the total in it. */ - _renderTotalCell: function() { + _renderTotalCell: function () { if (!this.matrix_data.show_column_totals || !this.matrix_data.show_row_totals) { return; diff --git a/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js new file mode 100644 index 00000000..b35f502c --- /dev/null +++ b/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js @@ -0,0 +1,17 @@ +odoo.define( "web_widget_x2many_2d_matrix.matrix_limit_extend", function (require) { +"use strict"; + + var AbstractView = require("web.AbstractView"); + + AbstractView.include({ + // We extend this method so that the view is not limited to + // just 40 cells when the 'x2many_2d_matrix' widget is used. + _setSubViewLimit: function (attrs) { + this._super(attrs); + if (attrs.widget === "x2many_2d_matrix") { + attrs.limit = Infinity; + } + }, + }; + } +); diff --git a/web_widget_x2many_2d_matrix/views/assets.xml b/web_widget_x2many_2d_matrix/views/assets.xml index ba820435..ab195651 100644 --- a/web_widget_x2many_2d_matrix/views/assets.xml +++ b/web_widget_x2many_2d_matrix/views/assets.xml @@ -5,6 +5,7 @@