Merge branch 'master' of github.com:grafana/grafana

28de5cbd · Torkel Ödegaard · 39cdf857 · 7c3046e0 · 28de5cbd · 28de5cbd
Commit 28de5cbd authored Aug 21, 2014 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/app/routes/dashboard-from-db.js
+2 -0

src/app/routes/dashboard-from-file.js
+1 -0

No files found.
--- a/src/app/routes/dashboard-from-db.js
+++ b/src/app/routes/dashboard-from-db.js
@@ -16,10 +16,12 @@ function (angular) {
      .when('/dashboard/elasticsearch/:id', {
        templateUrl: 'app/partials/dashboard.html',
        controller : 'DashFromDBProvider',
+        reloadOnSearch: false,
      })
      .when('/dashboard/temp/:id', {
        templateUrl: 'app/partials/dashboard.html',
        controller : 'DashFromDBProvider',
+        reloadOnSearch: false,
      });
  });

--- a/src/app/routes/dashboard-from-file.js
+++ b/src/app/routes/dashboard-from-file.js
@@ -14,6 +14,7 @@ function (angular, $, config, _) {
      .when('/dashboard/file/:jsonFile', {
        templateUrl: 'app/partials/dashboard.html',
        controller : 'DashFromFileProvider',
+        reloadOnSearch: false,
      });
  });