From 46af92c57e0d0d71f45d13d0b4bacb91ed2db16b Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 May 2014 06:55:39 -0400 Subject: Clean files --- routers/dev/template.go | 1 + 1 file changed, 1 insertion(+) (limited to 'routers') diff --git a/routers/dev/template.go b/routers/dev/template.go index 63d5d9a5..7145bf51 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -21,5 +21,6 @@ func TemplatePreview(ctx *middleware.Context, params martini.Params) { ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374" ctx.Data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60 ctx.Data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60 + ctx.Data["CurDbValue"] = "" ctx.HTML(200, params["_1"]) } -- cgit v1.2.3 From 89c99167b2916a36ef112125662e014ca5b9da26 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 May 2014 08:26:41 -0400 Subject: Fix #149 --- models/user.go | 1 + modules/auth/user.go | 1 + routers/user/setting.go | 1 + templates/user/profile.tmpl | 1 + templates/user/setting.tmpl | 7 +++++++ 5 files changed, 11 insertions(+) (limited to 'routers') diff --git a/models/user.go b/models/user.go index 6751d11d..42b3ebe6 100644 --- a/models/user.go +++ b/models/user.go @@ -46,6 +46,7 @@ type User struct { Id int64 LowerName string `xorm:"unique not null"` Name string `xorm:"unique not null"` + FullName string Email string `xorm:"unique not null"` Passwd string `xorm:"not null"` LoginType int diff --git a/modules/auth/user.go b/modules/auth/user.go index 97389422..8d60670d 100644 --- a/modules/auth/user.go +++ b/modules/auth/user.go @@ -75,6 +75,7 @@ type FeedsForm struct { type UpdateProfileForm struct { UserName string `form:"username" binding:"Required;AlphaDash;MaxSize(30)"` + FullName string `form:"fullname" binding:"MaxSize(40)"` Email string `form:"email" binding:"Required;Email;MaxSize(50)"` Website string `form:"website" binding:"MaxSize(50)"` Location string `form:"location" binding:"MaxSize(50)"` diff --git a/routers/user/setting.go b/routers/user/setting.go index a55e617f..f62e9310 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -54,6 +54,7 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) { user.Name = form.UserName } + user.FullName = form.FullName user.Email = form.Email user.Website = form.Website user.Location = form.Location diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 15d2a0bd..43ecabfa 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -6,6 +6,7 @@ user-avatar + {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} {{.Owner.Name}}
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl index 56d859fe..bdcf9ce3 100644 --- a/templates/user/setting.tmpl +++ b/templates/user/setting.tmpl @@ -17,6 +17,13 @@
+
+ +
+ +
+
+
-- cgit v1.2.3