From 3969cdd26560bafc79edc470d94a9ef1854441fe Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 7 Jul 2011 11:07:21 +0200 Subject: [PATCH] [fix] some concurrency problem with o2m & m2m bzr revid: nicolas.vanhoren@openerp.com-20110707090721-70hamcwp2p2xemrg --- addons/base/static/src/js/form.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index f65df9fcd01..ad9bd74614d 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -798,7 +798,7 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ var v_context1 = this.node.attrs.default_get || {}; var v_context2 = this.node.attrs.context || {}; var v_context = new openerp.base.CompoundContext(v_context1, v_context2); - if (v_context1.__ref || v_context2.__ref) { + if (v_context1.__ref || v_context2.__ref || true) { //TODO niv: remove || true var fields_values = this._build_view_fields_values(); v_context.set_eval_context(fields_values); } @@ -808,7 +808,7 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ build_domain: function() { var f_domain = this.field.domain || []; var v_domain = this.node.attrs.domain || []; - if (!(v_domain instanceof Array)) { + if (!(v_domain instanceof Array) || true) { //TODO niv: remove || true var fields_values = this._build_view_fields_values(); v_domain = new openerp.base.CompoundDomain(v_domain).set_eval_context(fields_values); } @@ -1509,7 +1509,9 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ } self.is_started.resolve(); }); - this.viewmanager.start(); + setTimeout(function () { + self.viewmanager.start(); + }, 0); }, reload_current_view: function() { var self = this; @@ -1662,7 +1664,9 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({ this.list_view.on_loaded.add_last(function() { self.is_started.resolve(); }); - this.list_view.start(); + setTimeout(function () { + self.list_view.start(); + }, 0); }, set_value: function(value) { value = value || [];