finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix 653

Browse source
This commit is contained in:
Unknwon 2014-11-22 10:22:53 -05:00
parent 8ea7ba3afa
commit dc53270da9
8 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
routers/user/setting.go
View file

@ -89,9 +89,6 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) {
defer ctx.Redirect(setting.AppSubUrl + "/user/settings")
ctx.User.UseCustomAvatar = form.Enable
if err := models.UpdateUser(ctx.User); err != nil {
ctx.Flash.Error(err.Error())
}
if form.Avatar != nil {
fr, err := form.Avatar.Open()
@ -113,7 +110,19 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) {
ctx.Flash.Error(err.Error())
return
}
} else {
// In case no avatar at all.
if form.Enable && !com.IsFile(ctx.User.CustomAvatarPath()) {
ctx.Flash.Error(ctx.Tr("settings.no_custom_avatar_available"))
return
}
}
if err := models.UpdateUser(ctx.User); err != nil {
ctx.Flash.Error(err.Error())
return
}
ctx.Flash.Success(ctx.Tr("settings.update_avatar_success"))
}