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

[fix] some problems in o2m 

bzr revid: nicolas.vanhoren@openerp.com-20120406120347-rlsiwq209474vuw0
This commit is contained in:
niv-openerp 2012-04-06 14:03:47 +02:00
parent 776c0cd2c4
commit 2dab475418
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2445,7 +2445,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
};
self.form_last_update = self.form_last_update.pipe(act, act);
return self.form_last_update;
} else if (active_view === "graph") {
} else if (view.do_search) {
return view.do_search(self.build_domain(), self.dataset.get_context(), []);
}
}, undefined);

4
addons/web/static/src/js/views.js
View File

@ -1095,10 +1095,10 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
},
load_view: function() {
if (this.embedded_view) {
var def = $.Deferred().pipe(this.on_loaded);
var def = $.Deferred();
var self = this;
$.async_when().then(function() {def.resolve(self.embedded_view);});
return def.promise();
return def.pipe(this.on_loaded);
} else {
var context = new session.web.CompoundContext(this.dataset.get_context());
if (! this.view_type)