Restore form inputs on organization create error (#34201)

Keeps the entered inputs when the "organization create" request
returns an error.

Co-authored-by: wxiaoguang <[email protected]>

Author: bytedream

routers/web/org/org.go

@@ -27,11 +27,14 @@ const (
 // Create render the page for create organization
 func Create(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_org")
-	ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode
 	if !ctx.Doer.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed")))
 		return
 	}
+
+	ctx.Data["visibility"] = setting.Service.DefaultOrgVisibilityMode
+	ctx.Data["repo_admin_change_team_access"] = true
+
 	ctx.HTML(http.StatusOK, tplCreateOrg)
 }
 

templates/org/create.tmpl

@@ -18,15 +18,15 @@
 					<label for="visibility">{{ctx.Locale.Tr "org.settings.visibility"}}</label>
 					<div class="inline-right">
 						<div class="ui radio checkbox">
-							<input class="enable-system-radio" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}>
+							<input class="enable-system-radio" name="visibility" type="radio" value="0" {{if .visibility.IsPublic}}checked{{end}}>
 							<label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
 						</div>
 						<div class="ui radio checkbox">
-							<input class="enable-system-radio" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}>
+							<input class="enable-system-radio" name="visibility" type="radio" value="1" {{if .visibility.IsLimited}}checked{{end}}>
 							<label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
 						</div>
 						<div class="ui radio checkbox">
-							<input class="enable-system-radio" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}>
+							<input class="enable-system-radio" name="visibility" type="radio" value="2" {{if .visibility.IsPrivate}}checked{{end}}>
 							<label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
 						</div>
 					</div>
@@ -35,7 +35,7 @@
 				<div class="inline field" id="permission_box">
 					<label>{{ctx.Locale.Tr "org.settings.permission"}}</label>
 					<div class="ui checkbox">
-						<input type="checkbox" name="repo_admin_change_team_access" checked>
+						<input type="checkbox" name="repo_admin_change_team_access" {{if .repo_admin_change_team_access}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "org.settings.repoadminchangeteam"}}</label>
 					</div>
 				</div>