IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 from jippi/feature/unique-local-storage-name

Browse Source 
Make sure kibana and grafana on same hostname do not interfere with each other
This commit is contained in:
Torkel Ödegaard 2014-02-05 19:16:02 +01:00
commit 8816e18027
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/services/dashboard.js
View File

@ -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))) { } else if(!(_.isUndefined(window.localStorage.grafanaDashboardDefault))) {
$location.path(window.localStorage.kibanaDashboardDefault); $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;