cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move user images to Active Storage with paperclip as a fallback

Browse source
This commit is contained in:
Tom Hughes 2019-07-02 22:31:31 +01:00
parent ba627420a3
commit 6c202448ad
14 changed files with 78 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/api/users/_user.builder
View file

@ -8,7 +8,7 @@ xml.tag! "user", :id => user.id,
else
xml.tag! "contributor-terms", :agreed => user.terms_agreed.present?
end
xml.tag! "img", :href => user_image_url(user) if user.image.file? || user.image_use_gravatar
xml.tag! "img", :href => user_image_url(user) if user.avatar.attached? || user.image.file? || user.image_use_gravatar
xml.tag! "roles" do
user.roles.each do |role|
xml.tag! role.role