Fix repo_admin_change_team_access always checked in org settings (#8319)

davidsvantesson · lafriks · commit 9c2a58456a69 · 2019-09-30T02:20:27.000+03:00
Signed-off-by: David Svantesson &lt;davidsvantesson@gmail.com&gt;
diff --git a/routers/org/setting.go b/routers/org/setting.go
@@ -31,6 +31,7 @@ func Settings(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
+	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
 	ctx.HTML(200, tplSettingsOptions)
 }
 
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
@@ -60,7 +60,7 @@
 							<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/>
+									<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .RepoAdminChangeTeamAccess}}checked{{end}}/>
 									<label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>
 								</div>
 							</div>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ func Settings(ctx *context.Context) {`
`31`	`31`	`ctx.Data["Title"] = ctx.Tr("org.settings")`
`32`	`32`	`ctx.Data["PageIsSettingsOptions"] = true`
`33`	`33`	`ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility`
	`34`	`+ ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess`
`34`	`35`	`ctx.HTML(200, tplSettingsOptions)`
`35`	`36`	`}`
`36`	`37`