diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-09-22 11:18:41 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-09-22 11:18:41 +0200 |
| commit | 4c031b95d03eff0b8c2a365139a78f5f62244d2c (patch) | |
| tree | e8974a0f6fea94da398fea1efa5eccc808abe84f /addons/web_graph/static/src | |
| parent | c82bd1365c1de3795a0c78d9a0638d36ebc61a58 (diff) | |
[FIX] correctly forward context in graph view
the new graph view silently ignored the context when doing its rpc
read_group. Usually, it's not really a problem, which is why it is only
now being fixed, but some models actually use the context in read_group.
(for ex, account_entries_report)
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_view.js | 1 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/pivot_table.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js index 25a1f932cc4..b4b2fb38f06 100644 --- a/addons/web_graph/static/src/js/graph_view.js +++ b/addons/web_graph/static/src/js/graph_view.js @@ -86,6 +86,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ col_group_by = groupbys.col_group_by; if (!this.graph_widget) { + this.widget_config.context = context; if (group_by.length) { this.widget_config.row_groupby = group_by; } diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js index 7de629a95c2..2d68cb43932 100644 --- a/addons/web_graph/static/src/js/pivot_table.js +++ b/addons/web_graph/static/src/js/pivot_table.js @@ -13,6 +13,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ init: function (model, domain, fields, options) { this.cells = []; this.domain = domain; + this.context = options.context; this.no_data = true; this.model = model; this.fields = fields; @@ -379,6 +380,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ return this.model.query(field_ids) .filter(domain) + .context(this.context) .group_by(groupby.field) .then(function (results) { var groups = _.filter(results, function (group) { |