summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/view_tree.js
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
committerVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
commit3203d264aecd751a8c261cea4f72fa323a3098be (patch)
tree93cdf7c89795b809963ef08a68d84d293cf41a7a /addons/web/static/src/js/view_tree.js
parent1497062ba1dbfd814c69fa4250c4eb6a09a5206a (diff)
parent064a50bcde5f1c65a17f4feb42348b5809081085 (diff)
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22
Diffstat (limited to 'addons/web/static/src/js/view_tree.js')
-rw-r--r--addons/web/static/src/js/view_tree.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 528a31c7869..902b5a99526 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -86,7 +86,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
'toolbar': has_toolbar
}));
- this.dataset.read_slice(this.fields_list(), {}, function (records) {
+ this.dataset.read_slice(this.fields_list()).then(function(records) {
if (!has_toolbar) {
// WARNING: will do a second read on the same ids, but only on
// first load so not very important
@@ -192,7 +192,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
getdata: function (id, children_ids) {
var self = this;
- self.dataset.read_ids(children_ids, this.fields_list(), function (records) {
+ self.dataset.read_ids(children_ids, this.fields_list()).then(function(records) {
_(records).each(function (record) {
self.records[record.id] = record;
});