fix UpdateOrgSettingForm

Author: yp05327

routers/web/org/setting.go

@@ -48,8 +48,16 @@ func Settings(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsOrgSettings"] = true
 	ctx.Data["PageIsSettingsOptions"] = true
-	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
-	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
+	ctx.Data["Form"] = forms.UpdateOrgSettingForm{
+		Name:                      ctx.Org.Organization.Name,
+		FullName:                  ctx.Org.Organization.FullName,
+		Description:               ctx.Org.Organization.Description,
+		Website:                   ctx.Org.Organization.Website,
+		Location:                  ctx.Org.Organization.Location,
+		Visibility:                ctx.Org.Organization.Visibility,
+		MaxRepoCreation:           ctx.Org.Organization.MaxRepoCreation,
+		RepoAdminChangeTeamAccess: ctx.Org.Organization.RepoAdminChangeTeamAccess,
+	}
 	ctx.HTML(http.StatusOK, tplSettingsOptions)
 }
 
@@ -59,7 +67,6 @@ func SettingsPost(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsOrgSettings"] = true
 	ctx.Data["PageIsSettingsOptions"] = true
-	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplSettingsOptions)

templates/org/settings/options.tmpl

@@ -17,43 +17,43 @@
 								<span class="text red gt-hidden" id="org-name-change-prompt"> {{.locale.Tr "org.settings.change_orgname_prompt"}}</span>
 								<span class="text red gt-hidden" id="org-name-change-redirect-prompt"> {{.locale.Tr "org.settings.change_orgname_redirect_prompt"}}</span>
 							</label>
-							<input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
+							<input id="org_name" name="name" value="{{.Form.Name}}" data-org-name="{{.Form.Name}}" autofocus required>
 						</div>
 						<div class="field {{if .Err_FullName}}error{{end}}">
 							<label for="full_name">{{.locale.Tr "org.org_full_name_holder"}}</label>
-							<input id="full_name" name="full_name" value="{{.Org.FullName}}">
+							<input id="full_name" name="full_name" value="{{.Form.FullName}}">
 						</div>
 						<div class="field {{if .Err_Description}}error{{end}}">
 							<label for="description">{{$.locale.Tr "org.org_desc"}}</label>
-							<textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea>
+							<textarea id="description" name="description" rows="2">{{.Form.Description}}</textarea>
 						</div>
 						<div class="field {{if .Err_Website}}error{{end}}">
 							<label for="website">{{.locale.Tr "org.settings.website"}}</label>
-							<input id="website" name="website" type="url" value="{{.Org.Website}}">
+							<input id="website" name="website" type="url" value="{{.Form.Website}}">
 						</div>
 						<div class="field">
 							<label for="location">{{.locale.Tr "org.settings.location"}}</label>
-							<input id="location" name="location"  value="{{.Org.Location}}">
+							<input id="location" name="location"  value="{{.Form.Location}}">
 						</div>
 
 						<div class="ui divider"></div>
 						<div class="field" id="visibility_box">
 							<label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label>
 							<div class="field">
 								<div class="ui radio checkbox">
-									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}>
+									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if eq .Form.Visibility 0}}checked{{end}}>
 									<label>{{.locale.Tr "org.settings.visibility.public"}}</label>
 								</div>
 							</div>
 							<div class="field">
 								<div class="ui radio checkbox">
-									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}>
+									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if eq .Form.Visibility 1}}checked{{end}}>
 									<label>{{.locale.Tr "org.settings.visibility.limited"}}</label>
 								</div>
 							</div>
 							<div class="field">
 								<div class="ui radio checkbox">
-									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}>
+									<input class="enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if eq .Form.Visibility 2}}checked{{end}}>
 									<label>{{.locale.Tr "org.settings.visibility.private"}}</label>
 								</div>
 							</div>
@@ -63,7 +63,7 @@
 							<label>{{.locale.Tr "org.settings.permission"}}</label>
 							<div class="field">
 								<div class="ui checkbox">
-									<input type="checkbox" name="repo_admin_change_team_access" {{if .RepoAdminChangeTeamAccess}}checked{{end}}>
+									<input type="checkbox" name="repo_admin_change_team_access" {{if .Form.RepoAdminChangeTeamAccess}}checked{{end}}>
 									<label>{{.locale.Tr "org.settings.repoadminchangeteam"}}</label>
 								</div>
 							</div>
@@ -74,7 +74,7 @@
 
 						<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
 							<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
-							<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Org.MaxRepoCreation}}">
+							<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Form.MaxRepoCreation}}">
 							<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
 						</div>
 						{{end}}