Sfoglia il codice sorgente

Panel timeshift: You can now use panel timeshift without a relative time override, Fixes #1848

Torkel Ödegaard 10 anni fa
parent
commit
1dfc576263
2 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 1 0
      CHANGELOG.md
  2. 1 1
      public/app/features/panel/panelHelper.js

+ 1 - 0
CHANGELOG.md

@@ -3,6 +3,7 @@
 **Fixes**
 **Fixes**
 - [Issue #1832](https://github.com/grafana/grafana/issues/1832). Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height.
 - [Issue #1832](https://github.com/grafana/grafana/issues/1832). Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height.
 - [Issue #1846](https://github.com/grafana/grafana/issues/1846). Snapshots: Fixed issue with snapshoting dashboards with an interval template variable
 - [Issue #1846](https://github.com/grafana/grafana/issues/1846). Snapshots: Fixed issue with snapshoting dashboards with an interval template variable
+- [Issue #1848](https://github.com/grafana/grafana/issues/1848). Panel timeshift: You can now use panel timeshift without a relative time override
 
 
 # 2.0.1 (2015-04-20)
 # 2.0.1 (2015-04-20)
 
 

+ 1 - 1
public/app/features/panel/panelHelper.js

@@ -43,7 +43,7 @@ function (angular, _, kbn, $) {
       }
       }
 
 
       if (scope.panel.timeShift) {
       if (scope.panel.timeShift) {
-        if (!kbn.isValidTimeSpan(scope.panel.timeFrom)) {
+        if (!kbn.isValidTimeSpan(scope.panel.timeShift)) {
           scope.panelMeta.timeInfo = 'invalid timeshift';
           scope.panelMeta.timeInfo = 'invalid timeshift';
           return;
           return;
         }
         }