IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-03 12:11:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-08-18 20:15:24 +02:00
parent 0339026674
commit 01d9849e44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/sqlstore/user.go
View File

@ -29,7 +29,7 @@ func init() {
bus.AddHandler("sql", UpdateUserPermissions) bus.AddHandler("sql", UpdateUserPermissions)
} }
func getOrgIdForNewUser(userEmail string, sess *session) (int64, error) { func getOrgIdForNewUser(cmd *m.CreateUserCommand, sess *session) (int64, error) {
var org m.Org var org m.Org
if setting.AutoAssignOrg { if setting.AutoAssignOrg {
@ -45,7 +45,7 @@ func getOrgIdForNewUser(userEmail string, sess *session) (int64, error) {
org.Id = 1 org.Id = 1
} }
} else { } else {
org.Name = userEmail org.Name = util.StringsFallback2(cmd.Email, cmd.Login)
} }
org.Created = time.Now() org.Created = time.Now()
@ -66,7 +66,7 @@ func getOrgIdForNewUser(userEmail string, sess *session) (int64, error) {
func CreateUser(cmd *m.CreateUserCommand) error { func CreateUser(cmd *m.CreateUserCommand) error {
return inTransaction2(func(sess *session) error { return inTransaction2(func(sess *session) error {
orgId, err := getOrgIdForNewUser(cmd.Email, sess) orgId, err := getOrgIdForNewUser(cmd, sess)
if err != nil { if err != nil {
return err return err
} }