Fix default for allowing new organization creation for new users (#7017) (#7034)

jpicht · lafriks · commit 75e491c03ef3 · 2019-05-25T02:00:04.000+03:00
* FIX issue 6542

When creating users DefaultAllowCreateOrganization was ignored.

Signed-off-by: Julian Picht &lt;julian.picht@gmail.com&gt;

* fix TestCreateUser_Issue5882

Signed-off-by: Julian Picht &lt;julian.picht@gmail.com&gt;
diff --git a/models/user.go b/models/user.go
@@ -832,10 +832,9 @@ func CreateUser(u *User) (err error) {
 		return err
 	}
 	u.HashPassword(u.Passwd)
-	u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization
+	u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization && !setting.Admin.DisableRegularOrgCreation
 	u.MaxRepoCreation = -1
 	u.Theme = setting.UI.DefaultTheme
-	u.AllowCreateOrganization = !setting.Admin.DisableRegularOrgCreation
 
 	if _, err = sess.Insert(u); err != nil {
 		return err
diff --git a/models/user_test.go b/models/user_test.go
@@ -261,6 +261,8 @@ func TestCreateUser_Issue5882(t *testing.T) {
 		{&User{Name: "GiteaBot2", Email: "GiteaBot2@gitea.io", Passwd: passwd, MustChangePassword: false}, true},
 	}
 
+	setting.Service.DefaultAllowCreateOrganization = true
+
 	for _, v := range tt {
 		setting.Admin.DisableRegularOrgCreation = v.disableOrgCreation
 

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,8 @@ func TestCreateUser_Issue5882(t *testing.T) {`
`261`	`261`	`{&User{Name: "GiteaBot2", Email: "[email protected]", Passwd: passwd, MustChangePassword: false}, true},`
`262`	`262`	`}`
`263`	`263`
	`264`	`+ setting.Service.DefaultAllowCreateOrganization = true`
	`265`	`+`
`264`	`266`	`for _, v := range tt {`
`265`	`267`	`setting.Admin.DisableRegularOrgCreation = v.disableOrgCreation`
`266`	`268`