소스 검색

Fix for auto refresh not being started after loading dashboard, Fixes #655

Torkel Ödegaard 11 년 전
부모
커밋
af073dad46
3개의 변경된 파일11개의 추가작업 그리고 0개의 파일을 삭제
  1. 5 0
      CHANGELOG.md
  2. 5 0
      src/app/controllers/dash.js
  3. 1 0
      src/app/services/dashboard/dashboardModel.js

+ 5 - 0
CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.7.0 (unreleased)
+
+**Fixes**
+- [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading
+
 # 1.7.0-rc1 (2014-08-05)
 # 1.7.0-rc1 (2014-08-05)
 
 
 **New features or improvements**
 **New features or improvements**

+ 5 - 0
src/app/controllers/dash.js

@@ -41,6 +41,11 @@ function (angular, $, config, _) {
 
 
       window.document.title = 'Grafana - ' + $scope.dashboard.title;
       window.document.title = 'Grafana - ' + $scope.dashboard.title;
 
 
+      // start auto refresh
+      if($scope.dashboard.refresh) {
+        $scope.dashboard.set_interval($scope.dashboard.refresh);
+      }
+
       dashboardKeybindings.shortcuts($scope);
       dashboardKeybindings.shortcuts($scope);
 
 
       $scope.emitAppEvent("dashboard-loaded", $scope.dashboard);
       $scope.emitAppEvent("dashboard-loaded", $scope.dashboard);

+ 1 - 0
src/app/services/dashboard/dashboardModel.js

@@ -28,6 +28,7 @@ function (angular, $, kbn, _) {
       this.nav = data.nav || [];
       this.nav = data.nav || [];
       this.time = data.time || { from: 'now-6h', to: 'now' };
       this.time = data.time || { from: 'now-6h', to: 'now' };
       this.templating = data.templating || { list: [] };
       this.templating = data.templating || { list: [] };
+      this.refresh = data.refresh;
 
 
       if (this.nav.length === 0) {
       if (this.nav.length === 0) {
         this.nav.push({ type: 'timepicker' });
         this.nav.push({ type: 'timepicker' });