Fix numericality validation to use correct integer only constraint

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

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 4b53c66f6825f1b38d5fdbde69653002762e9896..4509f10114bec03308da57e7744426389caf1a1b 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,6 +1,8 @@
 class Notifier < ActionMailer::Base
 class Notifier < ActionMailer::Base

-  default :from => EMAIL_FROM,
-          :return_path => EMAIL_RETURN_PATH,
+  include ActionView::Helpers::AssetUrlHelper
+
+  default :from => Settings.email_from,
+          :return_path => Settings.email_return_path,

           :auto_submitted => "auto-generated"
   helper :application
   before_action :set_shared_template_vars
           :auto_submitted => "auto-generated"
   helper :application
   before_action :set_shared_template_vars


@@ -177,15 +179,15 @@ class Notifier < ActionMailer::Base
   end
 
   def attach_user_avatar(user)
   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
 
   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?
+      return avatar.variant(:resize => "50x50>").blob.download

     else
     else

-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      return File.read(Rails.root.join("app", "assets", "images", "avatar_small.png"))

     end
   end
 
     end
   end
 


@@ -196,14 +198,14 @@ class Notifier < ActionMailer::Base
   end
 
   def from_address(name, type, id, digest, user_id = nil)
   end
 
   def from_address(name, type, id, digest, user_id = nil)

-    if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
+    if Settings.key?(:messages_domain) && domain = Settings.messages_domain

       if user_id
         "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
       else
         "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
       end
     else
       if user_id
         "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
       else
         "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
       end
     else

-      EMAIL_FROM
+      Settings.email_from

     end
   end
 end
     end
   end
 end