summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2015-12-01 14:38:09 +0100
committerGéry Debongnie <ged@odoo.com>2015-12-02 09:55:05 +0100
commitbcd7273ba889b8e146355a6fbb1b16f8438efa1e (patch)
tree0acfad696ac28e0a718b419f03cfcdb46f6ca0ae /addons/web/static/src
parent258c11a9a6fa00a83070de750ab19a916734d040 (diff)
[FIX] web: pivot axis switch groupby field
In ee0caa246 we solved some issue when a field was used in a "group by" filter, but was not considered "groupable" (which does not resolve related field in their related model to see if they fit the bill). This was fine, but this has to be also taken into account when these group by are applied to columns, which is possible by switching x and y axis. opw-647401
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_pivot.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_pivot.js b/addons/web/static/src/js/view_pivot.js
index 8dbfb3360e1..b9e3f07cb00 100644
--- a/addons/web/static/src/js/view_pivot.js
+++ b/addons/web/static/src/js/view_pivot.js
@@ -558,7 +558,7 @@ instance.web.PivotView = instance.web.View.extend({
display_total = this.main_col.width > 1;
var groupby_labels = _.map(this.main_col.groupbys, function (gb) {
- return self.groupable_fields[gb.split(':')[0]].string;
+ return self.fields[gb.split(':')[0]].string;
});
for (i = 0; i < headers.length; i++) {