summaryrefslogtreecommitdiff
path: root/addons/base_graph/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-08-16 16:25:15 +0200
committerXavier Morel <xmo@openerp.com>2011-08-16 16:25:15 +0200
commitffae7cb4b3e7350d19b273feb100ba73cd022214 (patch)
tree15a06c6746e4d6f9d7042a269362ed72728eeceb /addons/base_graph/static/src
parentd33c95fc4568516c22e12fdcce901d8250c9d218 (diff)
parent36a1a0f1c3f6fe471453d52955f97110220599a3 (diff)
[MERGE] from trunk
bzr revid: xmo@openerp.com-20110816142515-ohq33zvua5uq8cd3
Diffstat (limited to 'addons/base_graph/static/src')
-rw-r--r--addons/base_graph/static/src/js/graph.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js
index 25ce024638b..f7c949dc194 100644
--- a/addons/base_graph/static/src/js/graph.js
+++ b/addons/base_graph/static/src/js/graph.js
@@ -89,7 +89,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
}
this.dataset.domain = domain;
this.dataset.context = this.view_manager.dataset.context;
- this.dataset.read_slice(_(this.fields).keys(), 0, false, function(res) {
+ this.dataset.read_slice({fields: _(this.fields).keys()}, function(res) {
self.schedule_chart(res);
});
}
@@ -442,7 +442,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
}
views.push(view);
});
- this.session.action_manager.do_action({
+ this.do_action({
"res_model" : this.dataset.model,
"domain" : this.dataset.domain,
"views" : views,
@@ -468,9 +468,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
}
self.dataset.context = results.context;
self.dataset.domain = results.domain;
- self.dataset.read_slice([], 0, false,function(response){
- self.load_chart(response);
- });
+ self.dataset.read_slice({}, $.proxy(self, 'load_chart'));
});
}
});