Browse Source
Merge pull request #1014 from Eficent/11_fix_matrix_limit
[11.0][web_widget_x2many_matrix] fix issue with limit of records
pull/1118/head
Simone Orsi
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
20 additions and
2 deletions
-
web_widget_x2many_2d_matrix/__manifest__.py
-
web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
-
web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js
-
web_widget_x2many_2d_matrix/views/assets.xml
|
|
@ -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, " |
|
|
|
|
|
@ -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; |
|
|
|
|
|
@ -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; |
|
|
|
} |
|
|
|
}, |
|
|
|
}; |
|
|
|
} |
|
|
|
); |
|
|
@ -5,6 +5,7 @@ |
|
|
|
<xpath expr="." position="inside"> |
|
|
|
<script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js" /> |
|
|
|
<script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/widget_x2many_2d_matrix.js" /> |
|
|
|
<script type="text/javascript" src="/web_widget_x2many_2d_matrix/static/src/js/abstract_view_matrix_limit_extend.js" /> |
|
|
|
<link rel="stylesheet" href="/web_widget_x2many_2d_matrix/static/src/css/web_widget_x2many_2d_matrix.css"/> |
|
|
|
</xpath> |
|
|
|
</template> |
|
|
|