diff options
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index b0106bc8f01..8d8d49d0a44 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -257,16 +257,16 @@ instance.web_graph.GraphView = instance.web.View.extend({ var tree = $($.parseXML(view_get['arch'])); var pos = 0; - var xaxis = group_by || []; + var xaxis = _.clone(group_by || []); var yaxis = []; tree.find("field").each(function() { var field = $(this); if (! field.attr("name")) return; - if ((group_by.length == 0) && ((! pos) || field.attr('group'))) { + if ((group_by.length == 0) && ((! pos) || instance.web.py_eval(field.attr('group') || "false"))) { xaxis.push(field.attr('name')); } - if (pos && ! field.attr('group')) { + if (pos && ! instance.web.py_eval(field.attr('group') || "false")) { yaxis.push(field.attr('name')); } pos += 1; @@ -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]; })); }); |