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

support setting default org role when adding user via grafana.net auth

Browse Source
This commit is contained in:
Dan Cech
2016-09-20 12:36:36 -04:00
parent da95a23080
commit 630a8ed8aa
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,11 @@ func CreateUser(cmd *m.CreateUserCommand) error {
}
if setting.AutoAssignOrg && !user.IsAdmin {
orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
if len(cmd.DefaultOrgRole) > 0 {
orgUser.Role = m.RoleType(cmd.DefaultOrgRole)
} else {
orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
}
}
if _, err = sess.Insert(&orgUser); err != nil {