Prechádzať zdrojové kódy

Merge pull request #1592 from jwilder/jw-fixes

Anonymous access fixes
Torkel Ödegaard 10 rokov pred
rodič
commit
f417d9aa19
2 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 1 1
      conf/defaults.ini
  2. 1 1
      pkg/middleware/middleware.go

+ 1 - 1
conf/defaults.ini

@@ -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
 

+ 1 - 1
pkg/middleware/middleware.go

@@ -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