Commit a5318def by Torkel Ödegaard

Merge branch 'v4.3.x'

parents d4048e14 634ee0f9
...@@ -172,8 +172,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) { ...@@ -172,8 +172,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
for (var i = 0; i < yaxis.length; i++) { for (var i = 0; i < yaxis.length; i++) {
var axis = yaxis[i]; var axis = yaxis[i];
var panelOptions = panel.yaxes[i]; var panelOptions = panel.yaxes[i];
axis.options.max = panelOptions.max; axis.options.max = axis.options.max !== null ? axis.options.max : panelOptions.max;
axis.options.min = panelOptions.min; axis.options.min = axis.options.min !== null ? axis.options.min : panelOptions.min;
} }
} }
...@@ -505,6 +505,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) { ...@@ -505,6 +505,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
if (axis.logBase === 1) { if (axis.logBase === 1) {
return; return;
} }
if (axis.min < Number.MIN_VALUE) { if (axis.min < Number.MIN_VALUE) {
axis.min = null; axis.min = null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment