diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-01 19:43:25 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-01 19:43:25 +0100 |
| commit | 36945a5853b414b134278df55976619a335c3cfa (patch) | |
| tree | f40c3fbdbe6dadfb625dd9fff8be249db41ecf19 /addons/web/static/src/js/fields | |
| parent | a01933c9b4dc6ff4e1a0b73822df9097025c0e1c (diff) | |
| parent | c2e878e34c8e648099db34032e4a06807e80eb4d (diff) | |
[MERGE] forward port branch 11.0 up to c2e878e34c8
Diffstat (limited to 'addons/web/static/src/js/fields')
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index eba8dc90704..f81485a6b08 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -1008,7 +1008,10 @@ var FieldX2Many = AbstractField.extend({ * @param {OdooEvent} ev */ _onDiscardChanges: function (ev) { - ev.data.fieldName = this.name; + if (ev.target !== this) { + ev.stopPropagation(); + this.trigger_up('discard_changes', _.extend({}, ev.data, {fieldName: this.name})); + } }, /** * Called when the renderer asks to edit a line, in that case simply tells |