[FIX] web: Groupby not working on Pivot and Graph view

The groupby property was wrongly set in some cases: if a graph/pivot view is defined as a groupby on field F, but there is another groupby key G in the context, it will take F instead of G (at initial load).

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 49c00663d47..d74af7fee22 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -229,11 +229,12 @@ var PivotModel = AbstractModel.extend({
         this.data = {
             domain: params.domain,
             context: _.extend({}, session.user_context, params.context),
-            groupedBy: params.rowGroupBys,
+            groupedBy: params.groupedBy,
             colGroupBys: params.colGroupBys,
             measures: params.measures,
             sorted_column: {},
         };
+        this.defaultGroupedBy = params.groupedBy;
         return this._loadData();
     },
     /**
@@ -250,7 +251,7 @@ var PivotModel = AbstractModel.extend({
             this.data.domain = this.initialDomain;
         }
         if ('groupBy' in params) {
-            this.data.groupedBy = params.groupBy;
+            this.data.groupedBy = params.groupBy.length ? params.groupBy : this.defaultGroupedBy;
         }
         if (!this.data.has_data) {
             return this._loadData();