Custom bootstrap with all components disabled

[rails.git] / app / mailers / notifier.rb

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index e705efb006756f09a6f5ff21ea8b7665689725cc..b125999810b0571127e752a544ff2c7db15d1098 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,4 +1,8 @@
-class Notifier < ActionMailer::Base
+class Notifier < ApplicationMailer
+  include ActionView::Helpers::AssetUrlHelper
+
+  self.delivery_job = ActionMailer::MailDeliveryJob
+
   default :from => Settings.email_from,
           :return_path => Settings.email_return_path,
           :auto_submitted => "auto-generated"
@@ -173,19 +177,19 @@ class Notifier < ActionMailer::Base
   end
 
   def attach_project_logo
-    attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
+    attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png"))
   end
 
   def attach_user_avatar(user)
-    attachments.inline["avatar.png"] = File.read(user_avatar_file_path(user))
+    attachments.inline["avatar.png"] = user_avatar_file(user)
   end
 
-  def user_avatar_file_path(user)
-    image = user&.image
-    if image&.file?
-      return image.path(:small)
+  def user_avatar_file(user)
+    avatar = user&.avatar
+    if avatar&.attached?
+      avatar.variant(:resize => "50x50>").blob.download
     else
-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      File.read(Rails.root.join("app/assets/images/avatar_small.png"))
     end
   end