diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-11-06 15:53:36 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-11-06 15:53:36 +0100 |
| commit | 018a91ddc00a6462f8e69f3e33996e9cd1c0d123 (patch) | |
| tree | 92af43892b420065c2b9c0d34a116edbb1ef8522 /addons/web_graph | |
| parent | af2c38f4c9a7da9ae0de7652ca098910cbaee09e (diff) | |
| parent | 2ebaa6f666ac9f8ec30db92c0bf9ca68864e4289 (diff) | |
[MERGE] Sync with web/trunk.
bzr revid: tde@openerp.com-20121106145336-vm8vxzd9baui7iih
Diffstat (limited to 'addons/web_graph')
| -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]; })); }); |
