Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
5cf3425b
Commit
5cf3425b
authored
Oct 30, 2015
by
shoonoise
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable sign out button in case of auth proxy enabled
parent
9e2ef543
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
pkg/api/frontendsettings.go
+1
-0
public/app/core/controllers/sidemenu_ctrl.js
+1
-0
public/app/partials/sidemenu.html
+2
-3
No files found.
pkg/api/frontendsettings.go
View file @
5cf3425b
...
...
@@ -111,6 +111,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"datasources"
:
datasources
,
"appSubUrl"
:
setting
.
AppSubUrl
,
"allowOrgCreate"
:
(
setting
.
AllowUserOrgCreate
&&
c
.
IsSignedIn
)
||
c
.
IsGrafanaAdmin
,
"authProxyEnabled"
:
setting
.
AuthProxyEnabled
,
"buildInfo"
:
map
[
string
]
interface
{}{
"version"
:
setting
.
BuildVersion
,
"commit"
:
setting
.
BuildCommit
,
...
...
public/app/core/controllers/sidemenu_ctrl.js
View file @
5cf3425b
...
...
@@ -120,6 +120,7 @@ function (angular, _, $, coreModule, config) {
};
$scope
.
init
=
function
()
{
$scope
.
showSignup
=
contextSrv
.
isSignedIn
&&
!
config
[
'authProxyEnabled'
];
$scope
.
updateMenu
();
$scope
.
$on
(
'$routeChangeSuccess'
,
$scope
.
updateMenu
);
};
...
...
public/app/partials/sidemenu.html
View file @
5cf3425b
...
...
@@ -60,8 +60,7 @@
<span
class=
"sidemenu-item-text"
>
Grafana admin
</span>
</a>
</li>
<li
ng-if=
"contextSrv.isSignedIn"
>
<li
ng-if=
"showSignup"
>
<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=
"sidemenu-item-text"
>
Sign out
</span>
...
...
@@ -83,7 +82,7 @@
<span
class=
"sidemenu-item-text"
>
Exit admin
</span>
</a>
</li>
<li>
<li
ng-if=
"showSignup"
>
<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=
"sidemenu-item-text"
>
Sign out
</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment