From e5ed5904c62d9a618cb6f4ad852b021a02c3481e Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sun, 13 Sep 2015 10:05:18 -0400
Subject: [PATCH] #1606 GUI bug while adding ldap user

---
 cmd/web.go                    |  2 +-
 modules/auth/user_form.go     | 22 ++++++++++++++++------
 routers/admin/users.go        |  2 +-
 templates/admin/user/new.tmpl |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/cmd/web.go b/cmd/web.go
index bc8bb74ef..0e6c5e7b3 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -312,7 +312,7 @@ func runWeb(ctx *cli.Context) {
 		m.Group("/users", func() {
 			m.Get("", admin.Users)
 			m.Get("/new", admin.NewUser)
-			m.Post("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUserPost)
+			m.Post("/new", bindIgnErr(auth.AdminCrateUserForm{}), admin.NewUserPost)
 			m.Get("/:userid", admin.EditUser)
 			m.Post("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost)
 			m.Post("/:userid/delete", admin.DeleteUser)
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index dde403c26..5259e1ee3 100644
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -58,12 +58,10 @@ func (f *InstallForm) Validate(ctx *macaron.Context, errs binding.Errors) bindin
 //         \/                         \/
 
 type RegisterForm struct {
-	UserName  string `binding:"Required;AlphaDashDot;MaxSize(35)"`
-	Email     string `binding:"Required;Email;MaxSize(254)"`
-	Password  string `binding:"Required;MaxSize(255)"`
-	Retype    string
-	LoginType string
-	LoginName string
+	UserName string `binding:"Required;AlphaDashDot;MaxSize(35)"`
+	Email    string `binding:"Required;Email;MaxSize(254)"`
+	Password string `binding:"Required;MaxSize(255)"`
+	Retype   string
 }
 
 func (f *RegisterForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
@@ -80,6 +78,18 @@ func (f *SignInForm) Validate(ctx *macaron.Context, errs binding.Errors) binding
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+type AdminCrateUserForm struct {
+	UserName  string `binding:"Required;AlphaDashDot;MaxSize(35)"`
+	Email     string `binding:"Required;Email;MaxSize(254)"`
+	Password  string `binding:"MaxSize(255)"`
+	LoginType string
+	LoginName string
+}
+
+func (f *AdminCrateUserForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
 //   __________________________________________.___ _______    ________  _________
 //  /   _____/\_   _____/\__    ___/\__    ___/|   |\      \  /  _____/ /   _____/
 //  \_____  \  |    __)_   |    |     |    |   |   |/   |   \/   \  ___ \_____  \
diff --git a/routers/admin/users.go b/routers/admin/users.go
index 7553aba6b..dfa4d5ef2 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -63,7 +63,7 @@ func NewUser(ctx *middleware.Context) {
 	ctx.HTML(200, USER_NEW)
 }
 
-func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
+func NewUserPost(ctx *middleware.Context, form auth.AdminCrateUserForm) {
 	ctx.Data["Title"] = ctx.Tr("admin.users.new_account")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminUsers"] = true
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index f8dfad11b..5d02d1d6d 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -41,7 +41,7 @@
             <input class="fake" type="password">
             <div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}hide{{end}}">
               <label for="password">{{.i18n.Tr "password"}}</label>
-              <input id="password" name="password" type="password" value="{{.password}}" required>
+              <input id="password" name="password" type="password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
             </div>
 
             <div class="field">