summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/views/basic/basic_renderer.js8
-rw-r--r--addons/web/static/tests/views/form_tests.js27
2 files changed, 32 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js
index 99e6926d503..8af8540dd57 100644
--- a/addons/web/static/src/js/views/basic/basic_renderer.js
+++ b/addons/web/static/src/js/views/basic/basic_renderer.js
@@ -93,6 +93,7 @@ var BasicRenderer = AbstractRenderer.extend({
* that have been reset
*/
confirmChange: function (state, id, fields, ev) {
+ var self = this;
this.state = state;
var record = this._getRecord(id);
if (!record) {
@@ -106,12 +107,10 @@ var BasicRenderer = AbstractRenderer.extend({
// Reset all the field widgets that are marked as changed and the ones
// which are configured to always be reset on any change
- var resetWidgets = [];
_.each(this.allFieldWidgets[id], function (widget) {
var fieldChanged = _.contains(fields, widget.name);
if (fieldChanged || widget.resetOnAnyFieldChange) {
defs.push(widget.reset(record, ev, fieldChanged));
- resetWidgets.push(widget);
}
});
@@ -121,7 +120,10 @@ var BasicRenderer = AbstractRenderer.extend({
defs.push(this._updateAllModifiers(record));
return Promise.all(defs).then(function () {
- return resetWidgets;
+ return _.filter(self.allFieldWidgets[id], function (widget) {
+ var fieldChanged = _.contains(fields, widget.name);
+ return fieldChanged || widget.resetOnAnyFieldChange;
+ });
});
},
/**
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index e7729c878ee..66cfdc2413f 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -4838,6 +4838,33 @@ QUnit.module('Views', {
form.destroy();
});
+ QUnit.test('readonly set by modifier do not break many2many_tags', async function (assert) {
+ assert.expect(0);
+
+ this.data.partner.onchanges = {
+ bar: function (obj) {
+ obj.timmy = [[6, false, [12]]];
+ },
+ };
+ var form = await createView({
+ View: FormView,
+ model: 'partner',
+ data: this.data,
+ arch: '<form string="Partners">' +
+ '<sheet>' +
+ '<field name="bar"/>' +
+ '<field name="timmy" widget="many2many_tags" attrs="{\'readonly\': [(\'bar\',\'=\',True)]}"/>' +
+ '</sheet>' +
+ '</form>',
+ res_id: 5,
+ });
+
+ await testUtils.form.clickEdit(form);
+ await testUtils.dom.click(form.$('.o_field_widget[name=bar] input'));
+
+ form.destroy();
+ });
+
QUnit.test('check if id and active_id are defined', async function (assert) {
assert.expect(2);