Update bundle

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

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index bb4412e8a1927e4d702f3eeed884e785d51dc8db..c5c0118e6f8b395da0569c7f12b040bd341f5ffc 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -12,7 +12,7 @@ class UserMailer < ApplicationMailer
 
   def signup_confirm(user, token)
     with_recipient_locale user do
 
   def signup_confirm(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "users", :action => "confirm",
+      @url = url_for(:controller => "confirmations", :action => "confirm",

                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 


@@ -24,7 +24,7 @@ class UserMailer < ApplicationMailer
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email

-      @url = url_for(:controller => "users", :action => "confirm_email",
+      @url = url_for(:controller => "confirmations", :action => "confirm_email",

                      :confirm_string => token.token)
 
       mail :to => user.new_email,
                      :confirm_string => token.token)
 
       mail :to => user.new_email,


@@ -34,7 +34,7 @@ class UserMailer < ApplicationMailer
 
   def lost_password(user, token)
     with_recipient_locale user do
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "users", :action => "reset_password",
+      @url = url_for(:controller => "passwords", :action => "reset_password",

                      :token => token.token)
 
       mail :to => user.email,
                      :token => token.token)
 
       mail :to => user.email,


@@ -123,7 +123,7 @@ class UserMailer < ApplicationMailer
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do
 
   def note_comment_notification(comment, recipient)
     with_recipient_locale recipient do

-      @noteurl = browse_note_url(comment.note)
+      @noteurl = note_url(comment.note)

       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author
       @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
       @comment = comment.body
       @owner = recipient == comment.note.author


@@ -183,7 +183,7 @@ class UserMailer < ApplicationMailer
   end
 
   def attach_project_logo
   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"] = Rails.root.join("app/assets/images/osm_logo_30.png").read

   end
 
   def attach_user_avatar(user)
   end
 
   def attach_user_avatar(user)


@@ -194,13 +194,12 @@ class UserMailer < ApplicationMailer
     avatar = user&.avatar
     if avatar&.attached?
       if avatar.variable?
     avatar = user&.avatar
     if avatar&.attached?
       if avatar.variable?

-        image = avatar.variant(:resize => "50x50>").processed
-        image.service.download(image.key)
+        avatar.variant(:resize_to_limit => [50, 50]).download

       else
         avatar.blob.download
       end
     else
       else
         avatar.blob.download
       end
     else

-      File.read(Rails.root.join("app/assets/images/avatar_small.png"))
+      Rails.root.join("app/assets/images/avatar_small.png").read

     end
   end
 
     end
   end