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

Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-11 16:19:29 +01:00
parent 4f03a86414
commit f3d4d2782f
7 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/login.go
View File

@@ -25,7 +25,7 @@ func LoginView(c *middleware.Context) {
settings := c.Data["Settings"].(map[string]interface{})
settings["googleAuthEnabled"] = setting.OAuthService.Google
settings["githubAuthEnabled"] = setting.OAuthService.GitHub
settings["disableUserSignUp"] = setting.DisableUserSignUp
settings["disableUserSignUp"] = !setting.AllowUserSignUp
// Check auto-login.
uname := c.GetCookie(setting.CookieUserName)