From 9c91e279338f4d8bf09e1f7f5904d34cd525b102 Mon Sep 17 00:00:00 2001 From: Tamás Molnár Date: Sun, 6 Mar 2016 17:36:30 +0100 Subject: Added: Ability to delete org avatar. --- routers/user/setting.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'routers/user/setting.go') diff --git a/routers/user/setting.go b/routers/user/setting.go index 8d1b24dd..c704b67c 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -8,7 +8,6 @@ import ( "errors" "fmt" "io/ioutil" - "os" "strings" "github.com/Unknwon/com" @@ -156,12 +155,10 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) { } func SettingsDeleteAvatar(ctx *middleware.Context) { - os.Remove(ctx.User.CustomAvatarPath()) - - ctx.User.UseCustomAvatar = false - if err := models.UpdateUser(ctx.User); err != nil { - ctx.Flash.Error(fmt.Sprintf("UpdateUser: %v", err)) + if err := ctx.User.DeleteAvatar(); err != nil { + ctx.Flash.Error(err.Error()) } + ctx.Redirect(setting.AppSubUrl + "/user/settings") } -- cgit v1.2.3