Merge remote-tracking branch 'origin/master' into develop

10 years ago · 58034c24ce
parent af9dc4c277 1ac9b50f21
commit 58034c24ce
1 changed files with 2 additions and 1 deletions
--- a/src/app/panels/graph/graph.js
+++ b/src/app/panels/graph/graph.js
@ -370,10 +370,11 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
          if (min && max && ticks) {
            var secPerTick = ((max - min) / ticks) / 1000;

+            console.log('secPerTick', secPerTick);
            if (secPerTick <= 45) {
              return "%H:%M:%S";
            }
-            if (secPerTick <= 3600) {
+            if (secPerTick <= 7200) {
              return "%H:%M";
            }
            if (secPerTick <= 80000) {