diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-02 15:12:47 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-02 15:12:47 +0200 |
| commit | a36f6dbc29fddbcc2ea51adfeb2cb6e5db5784c6 (patch) | |
| tree | 1a73857c161f8bc7790e099f85cc81c7310a3bac /addons/web/static/src | |
| parent | 06989f697885db5aa5b5890e568a5e661570d31e (diff) | |
| parent | 928bc262a6389fdf64378f3e2505d182aa1349b5 (diff) | |
[MERGE] forward port of branch 9.0 up to 928bc26
Diffstat (limited to 'addons/web/static/src')
| -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, |