diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-02-27 15:20:21 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-02-27 15:20:21 +0100 |
| commit | d04d532201122de59467fcb10d4bab9e645b56b6 (patch) | |
| tree | 9ba7a31e432489405160db1ca7c9ae6224962d63 /addons/web_graph | |
| parent | 6bc2c8f25365eda664bc5b59b8474d17fbe03136 (diff) | |
| parent | 5c3eebcb4dc2b27cfb686573888728bb10ba0c88 (diff) | |
[MERGE] some others fixes from 7.0
bzr revid: nicolas.vanhoren@openerp.com-20130227141209-kemu3v78npynip87
bzr revid: nicolas.vanhoren@openerp.com-20130227142021-oc8i22kpfgmgv9jh
Diffstat (limited to 'addons/web_graph')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 35ad0aaaea8..0ae3f7c1508 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -246,7 +246,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ var result = []; var ticks = {}; - return obj.call("fields_view_get", [view_id, 'graph']).then(function(tmp) { + return this.alive(obj.call("fields_view_get", [view_id, 'graph']).then(function(tmp) { view_get = tmp; fields = view_get['fields']; var toload = _.select(group_by, function(x) { return fields[x] === undefined }); @@ -368,7 +368,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ 'ticks': _.map(ticks, function(el, key) { return [el, key] }) }; return res; - }); + })); }, // Render the graph and update menu styles |