diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
| commit | 77dbc558cf2de8bd6013c82e1ae3e84d2e2f6a40 (patch) | |
| tree | cd84be4601dd49817df075722d2e65388f9c1e68 /addons/web_graph/static/src/js/graph.js | |
| parent | 7184bd91515886ec8c2e4cddd163cba3658be781 (diff) | |
| parent | 74cda3df5bdf6be39358d804ea268401ee677401 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121102111255-wu683od04sr9h8dg
bzr revid: jra@tinyerp.com-20121105051417-pa5spswlxg20xcqx
Diffstat (limited to 'addons/web_graph/static/src/js/graph.js')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index ec8ee7cbd3d..8d8d49d0a44 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -340,8 +340,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ var defs = []; _.each(axis, function(x) { var key = x[xaxis[0]] - defs.push(obj.call("read_group", [new instance.web.CompoundDomain(domain, [[xaxis[0], '=' ,_convert_key(xaxis[0], key)]]), - yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).pipe(function(res) { + defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).pipe(function(res) { return [x, key, res]; })); }); |