Merge lp:~openerp-dev/openerp-web/7.0-opw-591896-cpa into lp:openerp-web/7.0

Proposed by Chirag Patel (OpenERP)
Status: Merged
Merged at revision: 3955
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-591896-cpa
Merge into: lp:openerp-web/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web_graph/static/src/js/graph.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-591896-cpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+163091@code.launchpad.net

Description of the change

Hello,

In graph view group by display wrong value.

To reproduce check the Bug Description

https://bugs.launchpad.net/openerp-web/+bug/1171937

Thanks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_graph/static/src/js/graph.js'
2--- addons/web_graph/static/src/js/graph.js 2013-03-01 10:25:55 +0000
3+++ addons/web_graph/static/src/js/graph.js 2013-05-09 05:57:26 +0000
4@@ -343,7 +343,7 @@
5 var defs = [];
6 _.each(axis, function(x) {
7 var key = x[xaxis[0]]
8- defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
9+ defs.push(obj.call("read_group", [x['__domain'], yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
10 return [x, key, res];
11 }));
12 });