summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/graph/graph_model.js
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2017-12-21 20:26:11 +0100
committerAaron Bohy <aab@odoo.com>2017-12-22 15:43:04 +0100
commit4f4e686fb275ad657e40205d27b89df86b764ee5 (patch)
tree2b9725b73475e721f9097cb24d1b8135572d962b /addons/web/static/src/js/views/graph/graph_model.js
parentc0769c753c4b4d5fa0b5a6a545f5f0141b71e83a (diff)
[FIX] web: graph: don't lose initial groupby at reload
Before this rev., when a graph view was reloaded (e.g. by clicking on the graph view switcher), the inital groupby was lost if it didn't come from the searchview (i.e. if it came from the context or from the arch). For instance, go to Sales > Reporting > Sales (the view is grouped by 'date', and there are two groups), reload by clicking on the graph view switcher: there is only one group left. The reload RPC was actually fine. What was wrong is the 'state' object given to the renderer after the reload, as it didn't contain the correct groupby, so the view wasn't correctly re-rendered.
Diffstat (limited to 'addons/web/static/src/js/views/graph/graph_model.js')
-rw-r--r--addons/web/static/src/js/views/graph/graph_model.js5
1 files changed, 2 insertions, 3 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 a6d2b057d0e..0518e279637 100644
--- a/addons/web/static/src/js/views/graph/graph_model.js
+++ b/addons/web/static/src/js/views/graph/graph_model.js
@@ -67,7 +67,6 @@ return AbstractModel.extend({
domain: params.domain,
context: params.context,
};
- this.defaultGroupedBy = params.groupedBy;
return this._loadGraph();
},
/**
@@ -96,7 +95,7 @@ return AbstractModel.extend({
this.chart.domain = params.domain;
}
if ('groupBy' in params) {
- this.chart.groupedBy = params.groupBy.length ? params.groupBy : this.defaultGroupedBy;
+ this.chart.groupedBy = params.groupBy.length ? params.groupBy : this.initialGroupBys;
}
if ('measure' in params) {
this.chart.measure = params.measure;
@@ -121,7 +120,7 @@ return AbstractModel.extend({
* @returns {Deferred}
*/
_loadGraph: function () {
- var groupedBy = this.chart.groupedBy.length ? this.chart.groupedBy : this.initialGroupBys;
+ var groupedBy = this.chart.groupedBy;
var fields = _.map(groupedBy, function (groupBy) {
return groupBy.split(':')[0];
});