diff options
Diffstat (limited to 'modules/auth/admin.go')
| -rw-r--r-- | modules/auth/admin.go | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go index 668afd9a..1f1260d6 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -5,17 +5,15 @@ package auth import ( - "net/http" - "reflect" + "github.com/Unknwon/macaron" + "github.com/macaron-contrib/i18n" - "github.com/go-martini/martini" - - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware/binding" ) type AdminEditUserForm struct { Email string `form:"email" binding:"Required;Email;MaxSize(50)"` + Passwd string `form:"password"` Website string `form:"website" binding:"MaxSize(50)"` Location string `form:"location" binding:"MaxSize(50)"` Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"` @@ -24,17 +22,6 @@ type AdminEditUserForm struct { LoginType int `form:"login_type"` } -func (f *AdminEditUserForm) Name(field string) string { - names := map[string]string{ - "Email": "E-mail address", - "Website": "Website", - "Location": "Location", - "Avatar": "Gravatar Email", - } - return names[field] -} - -func (f *AdminEditUserForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) { - data := context.Get(reflect.TypeOf(base.TmplData{})).Interface().(base.TmplData) - validate(errors, data, f) +func (f *AdminEditUserForm) Validate(ctx *macaron.Context, errs *binding.Errors, l i18n.Locale) { + validate(errs, ctx.Data, f, l) } |