diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-09-26 12:53:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-09-26 12:53:59 +0200 |
| commit | e2e60bf4eb89d92e883e8520771523c1c0377fd3 (patch) | |
| tree | c471997732b938ea4dac37340862dfe668fc1a0c /addons/web_graph | |
| parent | 4b8b2e8dfe3147beb5ab7c333269c2874eda5267 (diff) | |
| parent | fe8106fb85c5b0ba8d59fd95f44cde6379c3dec5 (diff) | |
[MERGE] forward port of branch saas-3 up to fe8106f
Diffstat (limited to 'addons/web_graph')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_view.js | 2 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/pivot_table.js | 2 |
2 files changed, 4 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 8ae99849bab..646a730b51b 100644 --- a/addons/web_graph/static/src/js/graph_view.js +++ b/addons/web_graph/static/src/js/graph_view.js @@ -85,6 +85,8 @@ instance.web_graph.GraphView = instance.web.View.extend({ measures = groupbys.measures; if (!this.graph_widget) { + this.widget_config.context = _.clone(context); + this.widget_config.context.group_by_no_leaf = true; 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 b66bc41e98c..a46203faff5 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.updating = false; this.model = model; @@ -412,6 +413,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ var self = this; return this.model.query(_.without(fields, '__count')) .filter(domain) + .context(this.context) .lazy(false) .group_by(groupbys) .then(function (groups) { |