summaryrefslogtreecommitdiff
path: root/addons/web_graph/static/src
diff options
context:
space:
mode:
authorvta vta@openerp.com <>2012-10-18 15:08:20 +0200
committervta vta@openerp.com <>2012-10-18 15:08:20 +0200
commitbaf6526de58474434817d642f6fdaecb2ef0136b (patch)
tree95fb8952a0d2c28ca854868d28dc4f211a2e22a6 /addons/web_graph/static/src
parenta31de511b6d753e52a114f9c9b438c07c449e8c6 (diff)
parent94cc99925c808805079df93aa07f75c74de114f1 (diff)
[MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121018130820-c95a4bsxsjq0vzxw
Diffstat (limited to 'addons/web_graph/static/src')
-rw-r--r--addons/web_graph/static/src/js/graph.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index b82b1521e87..788ec3bcb3f 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -23,6 +23,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
view_type: "graph",
init: function(parent, dataset, view_id, options) {
+ var self = this;
this._super(parent);
this.set_default_options(options);
this.dataset = dataset;
@@ -41,6 +42,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
this.group_by = [];
this.graph = null;
+ this.on('view_loaded', self, self.load_graph);
},
destroy: function () {
if (this.graph) {
@@ -49,7 +51,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
this._super();
},
- on_loaded: function(fields_view_get) {
+ load_graph: function(fields_view_get) {
// TODO: move to load_view and document
var self = this;
this.fields_view = fields_view_get;
@@ -98,7 +100,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
self.forcehtml = false;
});
});
- return this._super();
+ this.trigger('graph_view_loaded', fields_view_get);
},
get_format: function (options) {