|
|
|
@ -232,7 +232,6 @@ func verifyExistingOrg(sess *DBSession, orgId int64) error { |
|
|
|
|
|
|
|
|
|
|
|
func getOrCreateOrg(sess *DBSession, orgName string) (int64, error) { |
|
|
|
func getOrCreateOrg(sess *DBSession, orgName string) (int64, error) { |
|
|
|
var org models.Org |
|
|
|
var org models.Org |
|
|
|
|
|
|
|
|
|
|
|
if setting.AutoAssignOrg { |
|
|
|
if setting.AutoAssignOrg { |
|
|
|
has, err := sess.Where("id=?", setting.AutoAssignOrgId).Get(&org) |
|
|
|
has, err := sess.Where("id=?", setting.AutoAssignOrgId).Get(&org) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
@ -241,15 +240,16 @@ func getOrCreateOrg(sess *DBSession, orgName string) (int64, error) { |
|
|
|
if has { |
|
|
|
if has { |
|
|
|
return org.Id, nil |
|
|
|
return org.Id, nil |
|
|
|
} |
|
|
|
} |
|
|
|
if setting.AutoAssignOrgId == 1 { |
|
|
|
|
|
|
|
org.Name = mainOrgName |
|
|
|
if setting.AutoAssignOrgId != 1 { |
|
|
|
org.Id = int64(setting.AutoAssignOrgId) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
sqlog.Error("Could not create user: organization ID does not exist", "orgID", |
|
|
|
sqlog.Error("Could not create user: organization ID does not exist", "orgID", |
|
|
|
setting.AutoAssignOrgId) |
|
|
|
setting.AutoAssignOrgId) |
|
|
|
return 0, fmt.Errorf("could not create user: organization ID %d does not exist", |
|
|
|
return 0, fmt.Errorf("could not create user: organization ID %d does not exist", |
|
|
|
setting.AutoAssignOrgId) |
|
|
|
setting.AutoAssignOrgId) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
org.Name = mainOrgName |
|
|
|
|
|
|
|
org.Id = int64(setting.AutoAssignOrgId) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
org.Name = orgName |
|
|
|
org.Name = orgName |
|
|
|
} |
|
|
|
} |
|
|
|
|