summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorMathieu Duckerts-Antoine <dam@odoo.com>2018-10-01 14:27:14 +0200
committerMathieu Duckerts-Antoine <dam@odoo.com>2018-10-01 16:42:12 +0200
commit9b5dabd399813bc6a38fc63cc656e540b8a21fad (patch)
tree417776efff0ec7fdd215173b93fdac3b8fc65a4c /addons/web/static
parent2870af948e237e557f39287929e1a30de2c25730 (diff)
[FIX] web: right labels in bar chart and comparison mode
For a single groupby selected, the graph view didn't render well the data when simultaneously in bar chart and comparison mode. The labels were in that case always integers. This commit fixes that situation.
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/views/graph/graph_renderer.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js
index 8f6f7d8bebb..c2bb79c491f 100644
--- a/addons/web/static/src/js/views/graph/graph_renderer.js
+++ b/addons/web/static/src/js/views/graph/graph_renderer.js
@@ -136,11 +136,7 @@ return AbstractRenderer.extend({
}];
} else if (this.state.groupedBy.length === 1) {
values = this.state.data.map(function (datapt, index) {
- if (self.state.comparisonData) {
- return {x: index, y: datapt.value};
- } else {
- return {x: datapt.labels, y: datapt.value};
- }
+ return {x: datapt.labels, y: datapt.value};
});
data.push({
values: values,
@@ -148,7 +144,7 @@ return AbstractRenderer.extend({
});
if (this.state.comparisonData) {
values = this.state.comparisonData.map(function (datapt, index) {
- return {x: index, y: datapt.value};
+ return {x: datapt.labels, y: datapt.value};
});
data.push({
values: values,