fix AdminCreateUserForm

Author: yp05327

routers/web/admin/users.go

@@ -82,10 +82,12 @@ func NewUser(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.users.new_account")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminUsers"] = true
-	ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode
 	ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice()
 
-	ctx.Data["login_type"] = "0-0"
+	ctx.Data["Form"] = forms.AdminCreateUserForm{
+		LoginType:  "0-0",
+		Visibility: setting.Service.DefaultUserVisibilityMode,
+	}
 
 	sources, err := auth.Sources()
 	if err != nil {
@@ -104,7 +106,7 @@ func NewUserPost(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.users.new_account")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminUsers"] = true
-	ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode
+	ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice()
 
 	sources, err := auth.Sources()
 	if err != nil {

templates/admin/user/new.tmpl

@@ -14,7 +14,7 @@
 				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
 					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
 					<div class="ui selection type dropdown">
-						<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
+						<input type="hidden" id="login_type" name="login_type" value="{{.Form.LoginType}}" data-password="required" required>
 						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
 						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						<div class="menu">
@@ -29,11 +29,11 @@
 				<div class="inline field {{if .Err_Visibility}}error{{end}}">
 					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
 					<div class="ui selection type dropdown">
-						<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
+						<input type="hidden" id="visibility" name="visibility" value="{{.Form.Visibility}}">
 						<div class="text">
-							{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+							{{if .Form.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+							{{if .Form.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+							{{if .Form.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
 						</div>
 						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						<div class="menu">
@@ -50,27 +50,27 @@
 					</div>
 				</div>
 
-				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}gt-hidden{{end}}">
+				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .Form.LoginType "0-0"}}gt-hidden{{end}}">
 					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-					<input id="login_name" name="login_name" value="{{.login_name}}">
+					<input id="login_name" name="login_name" value="{{.Form.LoginName}}">
 				</div>
 				<div class="required field {{if .Err_UserName}}error{{end}}">
 					<label for="user_name">{{.locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" type="text" name="user_name" value="{{.Form.UserName}}" autofocus required>
 				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{.locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.email}}" required>
+					<input id="email" name="email" type="email" value="{{.Form.Email}}" required>
 				</div>
-				<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}gt-hidden{{end}}">
+				<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .Form.LoginType "0-0")}}gt-hidden{{end}}">
 					<label for="password">{{.locale.Tr "password"}}</label>
-					<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
+					<input id="password" name="password" type="password" autocomplete="new-password" value="{{.Form.Password}}" {{if eq .Form.LoginType "0-0"}}required{{end}}>
 				</div>
 
-				<div class="inline field local {{if ne .login_type "0-0"}}gt-hidden{{end}}">
+				<div class="inline field local {{if ne .Form.LoginType "0-0"}}gt-hidden{{end}}">
 					<div class="ui checkbox">
 						<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
-						<input name="must_change_password" type="checkbox" checked>
+						<input name="must_change_password" type="checkbox" {{if .Form.MustChangePassword}}checked{{end}}>
 					</div>
 				</div>
 
@@ -79,7 +79,7 @@
 					<div class="inline field">
 						<div class="ui checkbox">
 							<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
-							<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
+							<input name="send_notify" type="checkbox" {{if .Form.SendNotify}}checked{{end}}>
 						</div>
 					</div>
 				{{end}}