github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: refreshing gravatar wasn't working

Browse Source
This commit is contained in:
Régis Hanol
2015-09-17 19:42:44 +02:00
parent b45af1d6c8
commit 07e7b07b63
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/users_controller.rb
View File

@ -527,6 +527,8 @@ class UsersController < ApplicationController
render json: to_render
end
AVATAR_TYPES_WITH_UPLOAD ||= %w{uploaded custom gravatar}
def pick_avatar
user = fetch_user_from_params
guardian.ensure_can_edit!(user)
@ -536,10 +538,17 @@ class UsersController < ApplicationController
user.uploaded_avatar_id = upload_id
if type == "uploaded" || type == "custom"
user.user_avatar.custom_upload_id = upload_id
elsif type == "gravatar"
user.user_avatar.gravatar_upload_id = upload_id
if AVATAR_TYPES_WITH_UPLOAD.include?(type)
# make sure the upload exists
unless Upload.where(id: upload_id).exists?
return render_json_error I18n.t("avatar.missing")
end
if type == "gravatar"
user.user_avatar.gravatar_upload_id = upload_id
else
user.user_avatar.custom_upload_id = upload_id
end
end
user.save!