From 46894addc9ad97ea63ac4f9e6ef3c3dbd51693a7 Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Thu, 9 Feb 2023 16:23:18 +0800
Subject: [PATCH 1/6] record previous operation info when return to error page

---
 routers/web/org/org.go    | 3 +++
 templates/org/create.tmpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/routers/web/org/org.go b/routers/web/org/org.go
index f67e7edb4c7cc..6d866fdaf8e2e 100644
--- a/routers/web/org/org.go
+++ b/routers/web/org/org.go
@@ -28,6 +28,7 @@ const (
 func Create(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_org")
 	ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode
+	ctx.Data["RepoAdminChangeTeamAccess"] = true
 	if !ctx.Doer.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
 		return
@@ -60,6 +61,8 @@ func CreatePost(ctx *context.Context) {
 
 	if err := organization.CreateOrganization(org, ctx.Doer); err != nil {
 		ctx.Data["Err_OrgName"] = true
+		ctx.Data["DefaultOrgVisibilityMode"] = form.Visibility
+		ctx.Data["DefaultRepoAdminChangeTeamAccess"] = form.RepoAdminChangeTeamAccess
 		switch {
 		case user_model.IsErrUserAlreadyExist(err):
 			ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), tplCreateOrg, &form)
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 8da46fb325b24..b32d07981c403 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -37,7 +37,7 @@
 						<label>{{.locale.Tr "org.settings.permission"}}</label>
 						<div class="inline-grouped-list">
 							<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 .DefaultRepoAdminChangeTeamAccess}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label>
 							</div>
 						</div>

From 7f61f0498801935ac3c49f7ae617ca6e2d86556c Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Thu, 9 Feb 2023 16:32:59 +0800
Subject: [PATCH 2/6] fix

---
 routers/web/org/org.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/org/org.go b/routers/web/org/org.go
index 6d866fdaf8e2e..6feca5e8ef482 100644
--- a/routers/web/org/org.go
+++ b/routers/web/org/org.go
@@ -28,7 +28,7 @@ const (
 func Create(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_org")
 	ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode
-	ctx.Data["RepoAdminChangeTeamAccess"] = true
+	ctx.Data["DefaultRepoAdminChangeTeamAccess"] = true
 	if !ctx.Doer.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
 		return

From 330b1d85ffaf52dcb492deb7fb0207c9aa366bd5 Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Thu, 9 Feb 2023 17:24:57 +0800
Subject: [PATCH 3/6] fix

---
 routers/web/org/org.go    | 3 ---
 templates/org/create.tmpl | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/routers/web/org/org.go b/routers/web/org/org.go
index 6feca5e8ef482..f67e7edb4c7cc 100644
--- a/routers/web/org/org.go
+++ b/routers/web/org/org.go
@@ -28,7 +28,6 @@ const (
 func Create(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_org")
 	ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode
-	ctx.Data["DefaultRepoAdminChangeTeamAccess"] = true
 	if !ctx.Doer.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
 		return
@@ -61,8 +60,6 @@ func CreatePost(ctx *context.Context) {
 
 	if err := organization.CreateOrganization(org, ctx.Doer); err != nil {
 		ctx.Data["Err_OrgName"] = true
-		ctx.Data["DefaultOrgVisibilityMode"] = form.Visibility
-		ctx.Data["DefaultRepoAdminChangeTeamAccess"] = form.RepoAdminChangeTeamAccess
 		switch {
 		case user_model.IsErrUserAlreadyExist(err):
 			ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), tplCreateOrg, &form)
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index b32d07981c403..ae816e34a0b29 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -19,15 +19,15 @@
 						<span class="inline required field"><label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label></span>
 						<div class="inline-grouped-list">
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if or .DefaultOrgVisibilityMode.IsPublic (and .Err_OrgName .__form.Visibility.IsPublic)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.public"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if or .DefaultOrgVisibilityMode.IsLimited (and .Err_OrgName .__form.Visibility.IsLimited)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.limited"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if or .DefaultOrgVisibilityMode.IsPrivate (and .Err_OrgName .__form.Visibility.IsPrivate)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.private"}}</label>
 							</div>
 						</div>
@@ -37,7 +37,7 @@
 						<label>{{.locale.Tr "org.settings.permission"}}</label>
 						<div class="inline-grouped-list">
 							<div class="ui checkbox">
-								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if .DefaultRepoAdminChangeTeamAccess}}checked{{end}}/>
+								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if or (not .Err_OrgName) .__form.RepoAdminChangeTeamAccess}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label>
 							</div>
 						</div>

From a20c753e3c86e7f91ca6b0fb49b21052e14b1bda Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Thu, 9 Feb 2023 17:33:47 +0800
Subject: [PATCH 4/6] fix template params

---
 templates/org/create.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index ae816e34a0b29..59e410fdd8bfb 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -19,15 +19,15 @@
 						<span class="inline required field"><label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label></span>
 						<div class="inline-grouped-list">
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if or .DefaultOrgVisibilityMode.IsPublic (and .Err_OrgName .__form.Visibility.IsPublic)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if or .DefaultOrgVisibilityMode.IsPublic (and .Err_OrgName .visibility.IsPublic)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.public"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if or .DefaultOrgVisibilityMode.IsLimited (and .Err_OrgName .__form.Visibility.IsLimited)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if or .DefaultOrgVisibilityMode.IsLimited (and .Err_OrgName .visibility.IsLimited)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.limited"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if or .DefaultOrgVisibilityMode.IsPrivate (and .Err_OrgName .__form.Visibility.IsPrivate)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if or .DefaultOrgVisibilityMode.IsPrivate (and .Err_OrgName .visibility.IsPrivate)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.private"}}</label>
 							</div>
 						</div>
@@ -37,7 +37,7 @@
 						<label>{{.locale.Tr "org.settings.permission"}}</label>
 						<div class="inline-grouped-list">
 							<div class="ui checkbox">
-								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if or (not .Err_OrgName) .__form.RepoAdminChangeTeamAccess}}checked{{end}}/>
+								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if or (not .Err_OrgName) .repo_admin_change_team_access}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label>
 							</div>
 						</div>

From b5614ecbc86d932f2e45adc51d25e6656a7b9ca4 Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Thu, 9 Feb 2023 22:15:25 +0800
Subject: [PATCH 5/6] simplify judgment

---
 templates/org/create.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 59e410fdd8bfb..7dd04d738435b 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -19,15 +19,15 @@
 						<span class="inline required field"><label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label></span>
 						<div class="inline-grouped-list">
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if or .DefaultOrgVisibilityMode.IsPublic (and .Err_OrgName .visibility.IsPublic)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if or .DefaultOrgVisibilityMode.IsPublic .visibility.IsPublic}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.public"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if or .DefaultOrgVisibilityMode.IsLimited (and .Err_OrgName .visibility.IsLimited)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if or .DefaultOrgVisibilityMode.IsLimited .visibility.IsLimited}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.limited"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if or .DefaultOrgVisibilityMode.IsPrivate (and .Err_OrgName .visibility.IsPrivate)}}checked{{end}}/>
+								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if or .DefaultOrgVisibilityMode.IsPrivate .visibility.IsPrivate}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.visibility.private"}}</label>
 							</div>
 						</div>

From deab40e1cdbaa2c8dd3d8fe66e0a871afc197483 Mon Sep 17 00:00:00 2001
From: gedong <gedong_1994@163.com>
Date: Fri, 10 Feb 2023 15:20:53 +0800
Subject: [PATCH 6/6] fix

---
 templates/org/create.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 7dd04d738435b..36b773b845bae 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -37,7 +37,7 @@
 						<label>{{.locale.Tr "org.settings.permission"}}</label>
 						<div class="inline-grouped-list">
 							<div class="ui checkbox">
-								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if or (not .Err_OrgName) .repo_admin_change_team_access}}checked{{end}}/>
+								<input class="hidden" type="checkbox" name="repo_admin_change_team_access" {{if not (eq .repo_admin_change_team_access false)}}checked{{end}}/>
 								<label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label>
 							</div>
 						</div>