Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead.

Signed-off-by: David Svantesson <[email protected]>

Author: davidsvantesson

models/user.go

@@ -153,7 +153,7 @@ type User struct {
 	Members                   UserList            `xorm:"-"`
 	MembersIsPublic           map[int64]bool      `xorm:"-"`
 	Visibility                structs.VisibleType `xorm:"NOT NULL DEFAULT 0"`
-	RepoAdminChangeTeamAccess bool                `xorm:"NOT NULL DEFAULT true"`
+	RepoAdminChangeTeamAccess bool                `xorm:"NOT NULL DEFAULT false"`
 
 	// Preferences
 	DiffViewStyle string `xorm:"NOT NULL DEFAULT ''"`

options/locale/locale_en-US.ini

@@ -1472,6 +1472,8 @@ settings.options = Organization
 settings.full_name = Full Name
 settings.website = Website
 settings.location = Location
+settings.permission = Permissions
+settings.repoadminchangeteam = Repository admin can add and remove access for teams
 settings.visibility = Visibility
 settings.visibility.public = Public
 settings.visibility.limited = Limited (Visible to logged in users only)

routers/api/v1/org/org.go

@@ -95,14 +95,15 @@ func Create(ctx *context.APIContext, form api.CreateOrgOption) {
 	}
 
 	org := &models.User{
-		Name:        form.UserName,
-		FullName:    form.FullName,
-		Description: form.Description,
-		Website:     form.Website,
-		Location:    form.Location,
-		IsActive:    true,
-		Type:        models.UserTypeOrganization,
-		Visibility:  visibility,
+		Name:                      form.UserName,
+		FullName:                  form.FullName,
+		Description:               form.Description,
+		Website:                   form.Website,
+		Location:                  form.Location,
+		IsActive:                  true,
+		Type:                      models.UserTypeOrganization,
+		Visibility:                visibility,
+		RepoAdminChangeTeamAccess: form.RepoAdminChangeTeamAccess,
 	}
 	if err := models.CreateOrganization(org, ctx.User); err != nil {
 		if models.IsErrUserAlreadyExist(err) ||

templates/org/create.tmpl

@@ -32,6 +32,17 @@
 							</div>
 						</div>
 					</div>
+
+					<div class="field" id="permission_box">
+						<label>{{.i18n.Tr "org.settings.permission"}}</label>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/>
+								<label>{{.i18n.Tr "org.settings.permission.repoadminchangeteam"}}</label>
+							</div>
+						</div>
+					</div>
+
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button">

templates/org/settings/options.tmpl

@@ -57,11 +57,11 @@
 						</div>
 
 						<div class="field" id="permission_box">
-							<label>Permissions</label>
+							<label>{{.i18n.Tr "org.settings.permission"}}</label>
 							<div class="field">
 								<div class="ui checkbox">
-									<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .Org.RepoAdminChangeTeamAccess}}checked{{end}}/>
-									<label>Repository admin can add and remove access for teams</label>
+									<input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/>
+									<label>{{.i18n.Tr "org.settings.permission.repoadminchangeteam"}}</label>
 								</div>
 							</div>
 						</div>