Run any Active Storage jobs in the storage queue

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 1fc8e3ed2f1e0b6f82f6e325d0425c278a3d1e87..c22fef1ea2fa71e8d2f0a922a89e13316d5c5564 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -7,8 +7,12 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

-    else
+    elsif user.avatar.attached?
+      image_tag user.avatar.variant(:resize => "100x100>"), options
+    elsif user.image.file?

       image_tag user.image.url(:large), options
       image_tag user.image.url(:large), options

+    else
+      image_tag "avatar_large.png", options

     end
   end
 
     end
   end
 


@@ -18,8 +22,12 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

-    else
+    elsif user.avatar.attached?
+      image_tag user.avatar.variant(:resize => "50x50>"), options
+    elsif user.image.file?

       image_tag user.image.url(:small), options
       image_tag user.image.url(:small), options

+    else
+      image_tag "avatar_small.png", options

     end
   end
 
     end
   end
 


@@ -29,16 +37,24 @@ module UserHelper
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)

-    else
+    elsif user.avatar.attached?
+      image_tag user.avatar.variant(:resize => "50x50>"), options
+    elsif user.image.file?

       image_tag user.image.url(:small), options
       image_tag user.image.url(:small), options

+    else
+      image_tag "avatar_small.png", options

     end
   end
 
   def user_image_url(user, options = {})
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     end
   end
 
   def user_image_url(user, options = {})
     if user.image_use_gravatar
       user_gravatar_url(user, options)

-    else
+    elsif user.avatar.attached?
+      url_for(user.avatar.variant(:resize => "100x100>"))
+    elsif user.image.file?

       image_url(user.image.url(:large))
       image_url(user.image.url(:large))

+    else
+      image_url("avatar_large.png")

     end
   end
 
     end
   end
 


@@ -65,7 +81,7 @@ module UserHelper
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)
   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
 
     "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end