From 9c2a58456a698eae8a289de67685d4e3e270aaf9 Mon Sep 17 00:00:00 2001
From: David Svantesson <davidsvantesson@gmail.com>
Date: Mon, 30 Sep 2019 01:20:27 +0200
Subject: [PATCH] Fix repo_admin_change_team_access always checked in org
 settings (#8319)

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
---
 routers/org/setting.go              | 1 +
 templates/org/settings/options.tmpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/org/setting.go b/routers/org/setting.go
index 7de784c5b8..0aeefb50af 100644
--- 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
index 28660fe365..d58c77ad10 100644
--- 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>