feat: Able to disable non-admin to create new organization (#927)

2017-02-14 20:16:00 +08:00
parent 23aba523b5
commit d67b278a0d
7 changed files with 42 additions and 3 deletions
--- a/models/user.go
+++ b/models/user.go
@ -223,7 +223,7 @@ func (u *User) CanCreateRepo() bool {

 // CanCreateOrganization returns true if user can create organisation.
 func (u *User) CanCreateOrganization() bool {
-	return u.IsAdmin || u.AllowCreateOrganization
+	return u.IsAdmin || (u.AllowCreateOrganization && !setting.Admin.DisableRegularOrgCreation)
 }

 // CanEditGitHook returns true if user can edit Git hooks.