diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-02 14:26:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-02 14:26:19 +0200 |
| commit | 928bc262a6389fdf64378f3e2505d182aa1349b5 (patch) | |
| tree | a5d7c2c0b9934edac20320df98a4c75eba21523e /addons/web/static/src/js/views/graph_widget.js | |
| parent | 649b289fa10fcfd654a68ef6c923a07475f10296 (diff) | |
| parent | 589751ca28e6b55999b4c3bcb5c03519287c522b (diff) | |
[MERGE] forward port of branch saas-6 up to 589751c
Diffstat (limited to 'addons/web/static/src/js/views/graph_widget.js')
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 4 |
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, |