diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-08 12:19:23 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-08 12:19:23 +0200 |
| commit | ac5023060c1cd356ceb39dd1b17de7df7f2eaf43 (patch) | |
| tree | c51edb694148bbad033bf43098c84a7ff8c4449e /addons/web/static/src/js/views/graph_widget.js | |
| parent | 4a6adff30d3f11013cf0463a2c47afeeb8040a7f (diff) | |
| parent | 2f948c76aa3353a30b8fd04b39077a876a49f292 (diff) | |
[MERGE] forward port of branch saas-10 up to 2f948c7
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 e2c92535b23..2a8d38c05ec 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -165,7 +165,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, @@ -297,7 +297,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, |