cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set default_url_options for action_mailer

Browse source 
This saves having to repeat the same host and protocol options
throughout the notifiers
This commit is contained in:
Andy Allan 2018-04-11 15:53:30 +08:00
parent fc90b73581
commit 713de1fadb
3 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/models/notifier.rb
View file

@ -8,9 +8,7 @@ class Notifier < ActionMailer::Base
def signup_confirm(user, token) def signup_confirm(user, token)
with_recipient_locale user do with_recipient_locale user do
@url = url_for(:host => SERVER_URL, @url = url_for(:controller => "user", :action => "confirm",
:protocol => SERVER_PROTOCOL,
:controller => "user", :action => "confirm",
:display_name => user.display_name, :display_name => user.display_name,
:confirm_string => token.token) :confirm_string => token.token)
@ -22,9 +20,7 @@ class Notifier < ActionMailer::Base
def email_confirm(user, token) def email_confirm(user, token)
with_recipient_locale user do with_recipient_locale user do
@address = user.new_email @address = user.new_email
@url = url_for(:host => SERVER_URL, @url = url_for(:controller => "user", :action => "confirm_email",
:protocol => SERVER_PROTOCOL,
:controller => "user", :action => "confirm_email",
:confirm_string => token.token) :confirm_string => token.token)
mail :to => user.new_email, mail :to => user.new_email,
@ -34,9 +30,7 @@ class Notifier < ActionMailer::Base
def lost_password(user, token) def lost_password(user, token)
with_recipient_locale user do with_recipient_locale user do
@url = url_for(:host => SERVER_URL, @url = url_for(:controller => "user", :action => "reset_password",
:protocol => SERVER_PROTOCOL,
:controller => "user", :action => "reset_password",
:token => token.token) :token => token.token)
mail :to => user.email, mail :to => user.email,
@ -75,13 +69,9 @@ class Notifier < ActionMailer::Base
@from_user = message.sender.display_name @from_user = message.sender.display_name
@text = message.body @text = message.body
@title = message.title @title = message.title
@readurl = url_for(:host => SERVER_URL, @readurl = url_for(:controller => "message", :action => "read",
:protocol => SERVER_PROTOCOL,
:controller => "message", :action => "read",
:message_id => message.id) :message_id => message.id)
@replyurl = url_for(:host => SERVER_URL, @replyurl = url_for(:controller => "message", :action => "reply",
:protocol => SERVER_PROTOCOL,
:controller => "message", :action => "reply",
:message_id => message.id) :message_id => message.id)
@author = @from_user @author = @from_user
@ -99,26 +89,21 @@ class Notifier < ActionMailer::Base
@from_user = comment.user.display_name @from_user = comment.user.display_name
@text = comment.body @text = comment.body
@title = comment.diary_entry.title @title = comment.diary_entry.title
@readurl = url_for(:host => SERVER_URL, @readurl = url_for(:controller => "diary_entry",
:protocol => SERVER_PROTOCOL,
:controller => "diary_entry",
:action => "view", :action => "view",
:display_name => comment.diary_entry.user.display_name, :display_name => comment.diary_entry.user.display_name,
:id => comment.diary_entry.id, :id => comment.diary_entry.id,
:anchor => "comment#{comment.id}") :anchor => "comment#{comment.id}")
@commenturl = url_for(:host => SERVER_URL, @commenturl = url_for(:controller => "diary_entry",
:protocol => SERVER_PROTOCOL,
:controller => "diary_entry",
:action => "view", :action => "view",
:display_name => comment.diary_entry.user.display_name, :display_name => comment.diary_entry.user.display_name,
:id => comment.diary_entry.id, :id => comment.diary_entry.id,
:anchor => "newcomment") :anchor => "newcomment")
@replyurl = url_for(:host => SERVER_URL, @replyurl = url_for(:controller => "message",
:protocol => SERVER_PROTOCOL,
:controller => "message",
:action => "new", :action => "new",
:display_name => comment.user.display_name, :display_name => comment.user.display_name,
:title => "Re: #{comment.diary_entry.title}") :title => "Re: #{comment.diary_entry.title}")
@author = @from_user @author = @from_user
attach_user_avatar(comment.user) attach_user_avatar(comment.user)
@ -132,13 +117,9 @@ class Notifier < ActionMailer::Base
def friend_notification(friend) def friend_notification(friend)
with_recipient_locale friend.befriendee do with_recipient_locale friend.befriendee do
@friend = friend @friend = friend
@viewurl = url_for(:host => SERVER_URL, @viewurl = url_for(:controller => "user", :action => "view",
:protocol => SERVER_PROTOCOL,
:controller => "user", :action => "view",
:display_name => @friend.befriender.display_name) :display_name => @friend.befriender.display_name)
@friendurl = url_for(:host => SERVER_URL, @friendurl = url_for(:controller => "user", :action => "make_friend",
:protocol => SERVER_PROTOCOL,
:controller => "user", :action => "make_friend",
:display_name => @friend.befriender.display_name) :display_name => @friend.befriender.display_name)
@author = @friend.befriender.display_name @author = @friend.befriender.display_name
@ -150,7 +131,7 @@ class Notifier < ActionMailer::Base
def note_comment_notification(comment, recipient) def note_comment_notification(comment, recipient)
with_recipient_locale recipient do with_recipient_locale recipient do
@noteurl = browse_note_url(comment.note, :host => SERVER_URL) @noteurl = browse_note_url(comment.note)
@place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale) @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
@comment = comment.body @comment = comment.body
@owner = recipient == comment.note.author @owner = recipient == comment.note.author
@ -178,7 +159,7 @@ class Notifier < ActionMailer::Base
def changeset_comment_notification(comment, recipient) def changeset_comment_notification(comment, recipient)
with_recipient_locale recipient do with_recipient_locale recipient do
@to_user = recipient.display_name @to_user = recipient.display_name
@changeset_url = changeset_url(comment.changeset, :host => SERVER_URL) @changeset_url = changeset_url(comment.changeset)
@comment = comment.body @comment = comment.body
@owner = recipient == comment.changeset.user @owner = recipient == comment.changeset.user
@commenter = comment.author.display_name @commenter = comment.author.display_name
@ -202,7 +183,7 @@ class Notifier < ActionMailer::Base
private private
def set_shared_template_vars def set_shared_template_vars
@root_url = root_url(:host => SERVER_URL) @root_url = root_url
end end
def attach_project_logo def attach_project_logo

2
app/views/notifier/_message_body.html.erb
View file

@ -10,7 +10,7 @@
height: 50, height: 50,
border: 0 border: 0
), ),
user_url(@author, :host => SERVER_URL), user_url(@author),
:target => "_blank" :target => "_blank"
) %> ) %>
</td> </td>

3
config/application.rb
View file

@ -43,5 +43,8 @@ module OpenStreetMap
config.logstasher.logger_path = LOGSTASH_PATH config.logstasher.logger_path = LOGSTASH_PATH
config.logstasher.log_controller_parameters = true config.logstasher.log_controller_parameters = true
end end
# Set the host and protocol for all action mailer urls
config.action_mailer.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
end end
end end