Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-opw-586529-msh into lp:openerp-web/7.0

  1. 7.0-opw-586529-msh
  2. Merge into 7.0
Proposed by Mohammed Shekha(Open ERP)
Status: Merged
Merged at revision: 3796
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-586529-msh
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-586529-msh
Reviewer Review Type Date Requested Status
Xavier (Open ERP) Pending
Review via email: mp+149512@code.launchpad.net

Description of the change

Hello,

Fixed the issue of context not passed in fields_view_get method for graph view.

Demo:- Open any graph view and see the lables on y/x-axis, field labels are not translated that is because when fields_view_get called fron graph.js context not passed(as fields_view_get will call fields_get so fields_get result will not be translated and hence fields wil not be translated).

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 2012-12-13 14:09:14 +0000
3+++ addons/web_graph/static/src/js/graph.js 2013-02-20 10:23:26 +0000
4@@ -246,7 +246,7 @@
5 var result = [];
6 var ticks = {};
7
8- return obj.call("fields_view_get", [view_id, 'graph']).then(function(tmp) {
9+ return obj.call("fields_view_get", [view_id, 'graph', context]).then(function(tmp) {
10 view_get = tmp;
11 fields = view_get['fields'];
12 var toload = _.select(group_by, function(x) { return fields[x] === undefined });