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 branch 'sidemenu_default_open' of https://github.com/raintank/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-05-05 20:34:07 +02:00
commit e221cbfbd6
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/controllers/loginCtrl.js
View File

@ -14,7 +14,7 @@ function (angular, config) {
password: '', password: '',
}; };
contextSrv.setSideMenuState(false); contextSrv.sidemenu = false;
$scope.googleAuthEnabled = config.googleAuthEnabled; $scope.googleAuthEnabled = config.googleAuthEnabled;
$scope.githubAuthEnabled = config.githubAuthEnabled; $scope.githubAuthEnabled = config.githubAuthEnabled;

4
public/app/routes/dashLoadControllers.js
View File

@ -36,7 +36,9 @@ function (angular, _, kbn, moment, $) {
}); });
module.controller('DashFromSnapshotCtrl', function($scope, $routeParams, backendSrv) { module.controller('DashFromSnapshotCtrl', function($scope, $routeParams, backendSrv, contextSrv) {
//don't show the sidemenu in snapshots.
contextSrv.sidemenu = false;
backendSrv.get('/api/snapshots/' + $routeParams.key).then(function(result) { backendSrv.get('/api/snapshots/' + $routeParams.key).then(function(result) {
$scope.initDashboard(result, $scope); $scope.initDashboard(result, $scope);
}, function() { }, function() {

14
public/app/services/contextSrv.js
View File

@ -45,7 +45,19 @@ function (angular, _, store, config) {
this.user = new User(); this.user = new User();
this.isSignedIn = this.user.isSignedIn; this.isSignedIn = this.user.isSignedIn;
this.isGrafanaAdmin = this.user.isGrafanaAdmin; this.isGrafanaAdmin = this.user.isGrafanaAdmin;
this.sidemenu = store.getBool('grafana.sidemenu'); var sidemenuDefault = false;
if (this.hasRole('Admin')) {
sidemenuDefault = true;
}
this.sidemenu = store.getBool('grafana.sidemenu', sidemenuDefault);
if (this.isSignedIn && !store.exists('grafana.sidemenu')) {
// If the sidemnu has never been set before, set it to false.
// This will result in this.sidemenu and the localStorage grafana.sidemenu
// to be out of sync if the user has an admin role. But this is
// intentional and results in the user seeing the sidemenu only on
// their first login.
store.set('grafana.sidemenu', false);
}
this.isEditor = this.hasRole('Editor') || this.hasRole('Admin'); this.isEditor = this.hasRole('Editor') || this.hasRole('Admin');
}); });
}); });