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 #3122 from shoonoise/hide_signout

Browse Source 
Disable sign out button in case of auth proxy enabled
This commit is contained in:
Carl Bergquist 2015-12-14 17:18:04 +01:00
commit 548ee47aa7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/frontendsettings.go
View File

@ -114,6 +114,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"datasources": datasources, "datasources": datasources,
"appSubUrl": setting.AppSubUrl, "appSubUrl": setting.AppSubUrl,
"allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin, "allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
"authProxyEnabled": setting.AuthProxyEnabled,
"buildInfo": map[string]interface{}{ "buildInfo": map[string]interface{}{
"version": setting.BuildVersion, "version": setting.BuildVersion,
"commit": setting.BuildCommit, "commit": setting.BuildCommit,

1
public/app/core/controllers/sidemenu_ctrl.js
View File

@ -120,6 +120,7 @@ function (angular, _, $, coreModule, config) {
}; };
$scope.init = function() { $scope.init = function() {
$scope.showSignup = contextSrv.isSignedIn && !config['authProxyEnabled'];
$scope.updateMenu(); $scope.updateMenu();
$scope.$on('$routeChangeSuccess', $scope.updateMenu); $scope.$on('$routeChangeSuccess', $scope.updateMenu);
}; };

5
public/app/partials/sidemenu.html
View File

@ -60,8 +60,7 @@
<span class="sidemenu-item-text">Grafana admin</span> <span class="sidemenu-item-text">Grafana admin</span>
</a> </a>
</li> </li>
<li ng-if="showSignup">
<li ng-if="contextSrv.isSignedIn">
<a href="logout" class="sidemenu-item" target="_self"> <a href="logout" class="sidemenu-item" target="_self">
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span> <span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span>
<span class="sidemenu-item-text">Sign out</span> <span class="sidemenu-item-text">Sign out</span>
@ -83,7 +82,7 @@
<span class="sidemenu-item-text">Exit admin</span> <span class="sidemenu-item-text">Exit admin</span>
</a> </a>
</li> </li>
<li> <li ng-if="showSignup">
<a href="logout" class="sidemenu-item" target="_self"> <a href="logout" class="sidemenu-item" target="_self">
<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span> <span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-sign-out"></i></span>
<span class="sidemenu-item-text">Sign out</span> <span class="sidemenu-item-text">Sign out</span>