Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[FIX] web_widget_x2many_2d_matrix: Use widget for formatting aggregates

16.0
tarteo 2019-04-24 15:40:03 +02:00
parent 835b15a5fa
commit c000d824de
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_widget_x2many_2d_matrix/__manifest__.py
View File

@ -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': '12.0.1.0.3', 'version': '12.0.1.0.4',
'author': ( 'author': (
'Therp BV, ' 'Therp BV, '
'Tecnativa, ' 'Tecnativa, '

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

@ -306,21 +306,9 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
if (node.tag === 'widget') { if (node.tag === 'widget') {
return $td.append(this._renderWidget(record, node)); return $td.append(this._renderWidget(record, node));
} }
if (node.attrs.widget || (options && (options.renderWidgets || options.mode === 'edit'))) { var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode')); this._handleAttributes($el, node);
this._handleAttributes($el, node); return $td.append($el);
return $td.append($el);
}
var name = node.attrs.name;
var field = this.state.fields[name];
var value = record.data[name];
var formattedValue = field_utils.format[field.type](value, field, {
data: record.data,
escape: true,
isPassword: 'password' in node.attrs,
});
this._handleAttributes($td, node);
return $td.html(formattedValue);
}, },
/** /**
@ -513,10 +501,10 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
var field = this.state.fields[axis.attrs.name]; var field = this.state.fields[axis.attrs.name];
var value = axis.aggregate.value; var value = axis.aggregate.value;
var help = axis.aggregate.help; var help = axis.aggregate.help;
var formatFunc = field_utils.format[axis.attrs.widget]; var fieldInfo = this.state.fieldsInfo.list[axis.attrs.name];
if (!formatFunc) { var formatFunc = field_utils.format[
formatFunc = field_utils.format[field.type]; fieldInfo.widget ? fieldInfo.widget : field.type
} ];
var formattedValue = formatFunc(value, field, { escape: true }); var formattedValue = formatFunc(value, field, { escape: true });
$cell.addClass('o_list_number').attr('title', help).html(formattedValue); $cell.addClass('o_list_number').attr('title', help).html(formattedValue);
}, },