odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Ported o2m 

bzr revid: nicolas.vanhoren@openerp.com-20121011162918-d15ip9ci4o24axzy
This commit is contained in:
niv-openerp 2012-10-11 18:29:18 +02:00
parent fb944a77fa
commit 55a5f51aeb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/web/static/src/js/view_form.js
View File

@ -2877,7 +2877,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.is_started = false; this.is_started = false;
}, },
start: function() { start: function() {
this._super();
instance.web.form.ReinitializeFieldMixin.start.call(this); instance.web.form.ReinitializeFieldMixin.start.call(this);
this.is_started = true; this.is_started = true;
instance.web.bus.on('click', this, function() { instance.web.bus.on('click', this, function() {
@ -2885,6 +2884,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.$input.autocomplete("close"); this.$input.autocomplete("close");
} }
}); });
this._super();
}, },
reinit_value: function(val) { reinit_value: function(val) {
this.internal_set_value(val); this.internal_set_value(val);
@ -3213,6 +3213,16 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
this.is_setted = $.Deferred(); this.is_setted = $.Deferred();
this.form_last_update = $.Deferred(); this.form_last_update = $.Deferred();
this.init_form_last_update = this.form_last_update; this.init_form_last_update = this.form_last_update;
this.is_started = false;
this.dataset = new instance.web.form.One2ManyDataSet(this, this.field.relation);
this.dataset.o2m = this;
this.dataset.parent_view = this.view;
this.dataset.child_name = this.name;
var self = this;
this.dataset.on_change.add_last(function() {
self.trigger_on_change();
});
this.set_value([]);
}, },
start: function() { start: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -3220,14 +3230,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
var self = this; var self = this;
this.dataset = new instance.web.form.One2ManyDataSet(this, this.field.relation);
this.dataset.o2m = this;
this.dataset.parent_view = this.view;
this.dataset.child_name = this.name;
this.dataset.on_change.add_last(function() {
self.trigger_on_change();
});
this.is_setted.then(function() { this.is_setted.then(function() {
self.load_views(); self.load_views();
}); });
@ -3241,6 +3243,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
}); });
}); });
}); });
this.is_started = true;
this.reload_current_view();
}, },
trigger_on_change: function() { trigger_on_change: function() {
var tmp = this.doing_on_change; var tmp = this.doing_on_change;
@ -3429,7 +3433,11 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
} }
self.is_setted.resolve(); self.is_setted.resolve();
this.trigger_on_change(); this.trigger_on_change();
return self.reload_current_view(); if (this.is_started) {
return self.reload_current_view();
} else {
return $.when();
}
}, },
get_value: function() { get_value: function() {
var self = this; var self = this;