Преглед изворни кода

Make sure kibana and grafana on same hostname do not interfere with each other

This happens if you have kibana on /kibana and grafana on /grafana, resulting in some bad redirects
Christian Winther пре 12 година
родитељ
комит
e8be950752
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      src/app/services/dashboard.js

+ 4 - 4
src/app/services/dashboard.js

@@ -102,8 +102,8 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
             $location.path(config.default_route);
             $location.path(config.default_route);
             alertSrv.set('Saving to browser storage has been replaced',' with saving to Elasticsearch.'+
             alertSrv.set('Saving to browser storage has been replaced',' with saving to Elasticsearch.'+
               ' Click <a href="#/dashboard/local/deprecated">here</a> to load your old dashboard anyway.');
               ' Click <a href="#/dashboard/local/deprecated">here</a> to load your old dashboard anyway.');
-          } else if(!(_.isUndefined(window.localStorage.kibanaDashboardDefault))) {
-            $location.path(window.localStorage.kibanaDashboardDefault);
+          } else if(!(_.isUndefined(window.localStorage.grafanaDashboardDefault))) {
+            $location.path(window.localStorage.grafanaDashboardDefault);
           } else {
           } else {
             $location.path(config.default_route);
             $location.path(config.default_route);
           }
           }
@@ -197,7 +197,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
         if(!_.isUndefined(window.localStorage['dashboard'])) {
         if(!_.isUndefined(window.localStorage['dashboard'])) {
           delete window.localStorage['dashboard'];
           delete window.localStorage['dashboard'];
         }
         }
-        window.localStorage.kibanaDashboardDefault = route;
+        window.localStorage.grafanaDashboardDefault = route;
         return true;
         return true;
       } else {
       } else {
         return false;
         return false;
@@ -211,7 +211,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
 
 
           delete window.localStorage['dashboard'];
           delete window.localStorage['dashboard'];
         }
         }
-        delete window.localStorage.kibanaDashboardDefault;
+        delete window.localStorage.grafanaDashboardDefault;
         return true;
         return true;
       } else {
       } else {
         return false;
         return false;