Browse Source
Merge pull request #919 from Eficent/11.0-fix-web_widget_x2many_2d_matrix
[11.0][FIX] Make matrix editable depending of the status of the parent
pull/922/merge
Jordi Ballester Alomar
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
web_widget_x2many_2d_matrix/__manifest__.py
-
web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
|
|
@ -4,7 +4,7 @@ |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). |
|
|
{ |
|
|
{ |
|
|
"name": "2D matrix for x2many fields", |
|
|
"name": "2D matrix for x2many fields", |
|
|
"version": "11.0.1.0.1", |
|
|
|
|
|
|
|
|
"version": "11.0.1.0.2", |
|
|
"author": "Therp BV, " |
|
|
"author": "Therp BV, " |
|
|
"Tecnativa, " |
|
|
"Tecnativa, " |
|
|
"Camptocamp, " |
|
|
"Camptocamp, " |
|
|
|
|
|
@ -238,7 +238,7 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ |
|
|
if (modifiers.invisible && !(options && options.renderInvisible)) { |
|
|
if (modifiers.invisible && !(options && options.renderInvisible)) { |
|
|
return $td; |
|
|
return $td; |
|
|
} |
|
|
} |
|
|
options.mode = 'edit'; // enforce edit mode
|
|
|
|
|
|
|
|
|
options.mode = this.getParent().mode; // enforce mode of the parent
|
|
|
var widget = this._renderFieldWidget(node, record, _.pick(options, 'mode')); |
|
|
var widget = this._renderFieldWidget(node, record, _.pick(options, 'mode')); |
|
|
this._handleAttributes(widget.$el, node); |
|
|
this._handleAttributes(widget.$el, node); |
|
|
return $td.append(widget.$el); |
|
|
return $td.append(widget.$el); |
|
|
|
