IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-23 23:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.3.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-24 11:20:35 +02:00
commit a5318def66
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/panel/graph/graph.ts
View File

@ -172,8 +172,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
for (var i = 0; i < yaxis.length; i++) {
var axis = yaxis[i];
var panelOptions = panel.yaxes[i];
axis.options.max = panelOptions.max;
axis.options.min = panelOptions.min;
axis.options.max = axis.options.max !== null ? axis.options.max : panelOptions.max;
axis.options.min = axis.options.min !== null ? axis.options.min : panelOptions.min;
}
}
@ -505,6 +505,7 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
if (axis.logBase === 1) {
return;
}
if (axis.min < Number.MIN_VALUE) {
axis.min = null;
}