From b7bf9dfd285a5d64bfcd6a3148c646f03984e594 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 7 Nov 2016 17:55:31 +0100 Subject: [PATCH] more --- modules/auth/user_form.go | 4 ++-- routers/org/setting.go | 2 +- routers/user/setting.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 7bd6c7b9b..09ef53db8 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -101,8 +101,8 @@ func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors) } const ( - AVATAR_LOCAL string = "local" - AVATAR_BYMAIL string = "bymail" + AvatarLocal string = "local" + AvatarByMail string = "bymail" ) type AvatarForm struct { diff --git a/routers/org/setting.go b/routers/org/setting.go index 216977923..70d5e3e20 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -84,7 +84,7 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { } func SettingsAvatar(ctx *context.Context, form auth.AvatarForm) { - form.Source = auth.AVATAR_LOCAL + form.Source = auth.AvatarLocal if err := user.UpdateAvatarSetting(ctx, form, ctx.Org.Organization); err != nil { ctx.Flash.Error(err.Error()) } else { diff --git a/routers/user/setting.go b/routers/user/setting.go index 35763ab48..4d698bc2a 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -104,7 +104,7 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) { // FIXME: limit size. func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *models.User) error { - ctxUser.UseCustomAvatar = form.Source == auth.AVATAR_LOCAL + ctxUser.UseCustomAvatar = form.Source == auth.AvatarLocal if len(form.Gravatar) > 0 { ctxUser.Avatar = base.EncodeMD5(form.Gravatar) ctxUser.AvatarEmail = form.Gravatar