X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3ec67ea2d395f9ae78f806f8e583e10d691861de..1addc078c0809ef591057980a7ab6cdab9891e44:/app/helpers/user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 1fc8e3ed2..74f16380c 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -7,8 +7,10 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "100x100>"), options
     else
-      image_tag user.image.url(:large), options
+      image_tag "avatar_large.png", options
     end
   end
 
@@ -18,8 +20,10 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
-      image_tag user.image.url(:small), options
+      image_tag "avatar_small.png", options
     end
   end
 
@@ -29,16 +33,20 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
+    elsif user.avatar.attached?
+      image_tag user_avatar_variant(user, :resize => "50x50>"), options
     else
-      image_tag user.image.url(:small), options
+      image_tag "avatar_small.png", options
     end
   end
 
   def user_image_url(user, options = {})
     if user.image_use_gravatar
       user_gravatar_url(user, options)
+    elsif user.avatar.attached?
+      polymorphic_url(user_avatar_variant(user, :resize => "100x100>"), :host => Settings.server_url)
     else
-      image_url(user.image.url(:large))
+      image_url("avatar_large.png")
     end
   end
 
@@ -59,13 +67,23 @@ module UserHelper
 
   private
 
+  # Local avatar support
+
+  def user_avatar_variant(user, options)
+    if user.avatar.variable?
+      user.avatar.variant(options)
+    else
+      user.avatar
+    end
+  end
+
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)
-    default_image_url = image_url("users/images/large.png")
+    default_image_url = image_url("avatar_large.png")
     "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end