Skip to content

Commit

Permalink
[FIX] web_widget_x2many_2d_matrix: _renderBodyCell
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-pelykh committed Dec 6, 2018
1 parent 24dc54d commit 30bfaa3
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions web_widget_x2many_2d_matrix/static/src/js/2d_matrix_renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,24 @@ odoo.define('web_widget_x2many_2d_matrix.X2Many2dMatrixRenderer', function (requ
}
// Enforce mode of the parent
options.mode = this.getParent().mode;
var widget = this._renderFieldWidget(
node, record, _.pick(options, 'mode')
);
this._handleAttributes(widget.$el, node);
return $td.append(widget.$el);
if (node.tag === 'widget') {
return $td.append(this._renderWidget(record, node));
}
if (node.attrs.widget || (options && options.renderWidgets)) {
var $el = this._renderFieldWidget(node, record, _.pick(options, 'mode'));
this._handleAttributes($el, node);
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);(widget.$el);
},

/**
Expand Down

0 comments on commit 30bfaa3

Please sign in to comment.