IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 17:06:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1592 from jwilder/jw-fixes

Browse Source 
Anonymous access fixes
This commit is contained in:
Torkel Ödegaard 2015-03-12 19:41:20 +01:00
commit f417d9aa19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@ -78,7 +78,7 @@ auto_assign_org_role = Viewer
; enable anonymous access
enabled = false
; specify organization name that should be used for unauthenticated users
org_name = Main org.
org_name = main
; specify role for unauthenticated users
org_role = Viewer

2
pkg/middleware/middleware.go
View File

@ -75,7 +75,7 @@ func GetContextHandler() macaron.Handler {
} else if setting.AnonymousEnabled {
orgQuery := m.GetOrgByNameQuery{Name: setting.AnonymousOrgName}
if err := bus.Dispatch(&orgQuery); err != nil {
log.Error(3, "Anonymous access organization error", nil)
log.Error(3, "Anonymous access organization error: '%s': %s", setting.AnonymousOrgName, err)
} else {
ctx.IsSignedIn = false
ctx.AllowAnonymous = true