[MERGE] forward port branch saas-16 up to 104dfe3c07d

1 files changed, 3 insertions, 6 deletions

diff --git a/addons/web/static/src/js/views/graph/graph_model.js b/addons/web/static/src/js/views/graph/graph_model.js
index 5948e07a54f..8a7f5da6d5d 100644
--- a/addons/web/static/src/js/views/graph/graph_model.js
+++ b/addons/web/static/src/js/views/graph/graph_model.js
@@ -60,12 +60,13 @@ return AbstractModel.extend({
         this.modelName = params.modelName;
         this.chart = {
             data: [],
-            groupedBy: params.groupBys,
+            groupedBy: params.groupedBy.length ? params.groupedBy : params.groupBys,
             measure: params.measure,
             mode: params.mode,
             domain: params.domain,
             context: params.context,
         };
+        this.defaultGroupedBy = params.groupedBy;
         return this._loadGraph();
     },
     /**
@@ -88,11 +89,7 @@ return AbstractModel.extend({
             this.chart.domain = params.domain;
         }
         if ('groupBy' in params) {
-            if (!params.groupBy.length) {
-                this.chart.groupedBy = this.initialGroupBys;
-            } else {
-                this.chart.groupedBy = params.groupBy;
-            }
+            this.chart.groupedBy = params.groupBy.length ? params.groupBy : this.defaultGroupedBy;
         }
         if ('measure' in params) {
             this.chart.measure = params.measure;