summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/graph_widget.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-11-30 14:44:49 +0100
committerChristophe Simonis <chs@odoo.com>2017-11-30 14:44:49 +0100
commit98539336a5d40de748764ff0a3c16d8cda77b02f (patch)
treec5b18d5375f4ac458546ff28b29445be9dce0549 /addons/web/static/src/js/views/graph_widget.js
parent92f7ecc263ffc252bbec71c9813e12f2933045a2 (diff)
parentb780e4a0e4389045979fdb82db34e09d4d672cbd (diff)
[MERGE] forward port branch saas-14 up to b780e4a0e43
Diffstat (limited to 'addons/web/static/src/js/views/graph_widget.js')
-rw-r--r--addons/web/static/src/js/views/graph_widget.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index f778c7201ec..36908e65f6b 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -67,7 +67,8 @@ return Widget.extend({
values = [];
if (this.groupbys.length === 1) data_pt.value = [data_pt.value];
for (j = 0; j < data_pt.value.length; j++) {
- values[j] = this.sanitize_value(data_pt.value[j], data_pt.grouped_on[j]);
+ var field = _.isArray(data_pt.grouped_on) ? data_pt.grouped_on[j] : data_pt.grouped_on;
+ values[j] = this.sanitize_value(data_pt.value[j], field);
}
value = is_count ? data_pt.length : data_pt.aggregates[this.measure];
this.data.push({