summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-03 12:33:58 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-03 12:33:58 +0200
commite54fb3eb22cb100c668ef7101b9852ec76cdef72 (patch)
treef05f979a371ce8f382550e2b032a7cee665df279 /addons/web/static/src
parentb624dd7aa43d8df2f4f72cfcc26014f8687fdecf (diff)
parent30864b6d008748a70fc686722d312de6055219c8 (diff)
[MERGE] forward port of branch saas-9 up to 30864b6
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/graph_widget.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index e458cc483ed..599899dd32f 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -164,7 +164,7 @@ return Widget.extend({
var chart = nv.models.multiBarChart();
var maxVal = _.max(values, function(v) {return v.y})
chart.options({
- margin: {left: 12 * String(maxVal && maxVal.y || 0).length},
+ margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length},
delay: 250,
transition: 10,
showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
@@ -296,7 +296,7 @@ return Widget.extend({
var chart = nv.models.lineChart();
var maxVal = _.max(values, function(v) {return v.y})
chart.options({
- margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50},
+ margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, right: 50},
useInteractiveGuideline: true,
showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
showXAxis: true,