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

Moved message table HTMl to a partial template

Browse source 
Several notifications are about a message having been sent from one user to another via OSM. I've moved the code for the HTML table that holds the actual user message, with the avatar and the body text, to its own partial template, so that it can be reused. I've updated a second notifier message to the new template, diary_comment_notification.
This commit is contained in:
Herve Saint-Amand 2017-01-08 22:09:10 +00:00
parent 479a4bd0d7
commit 417176f868
4 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/models/notifier.rb
View file

@ -3,6 +3,7 @@ class Notifier < ActionMailer::Base
:return_path => EMAIL_RETURN_PATH,
:auto_submitted => "auto-generated"
helper :application
before_action :set_shared_template_vars
def signup_confirm(user, token)
with_recipient_locale user do
@ -106,6 +107,9 @@ class Notifier < ActionMailer::Base
:action => "new",
:display_name => comment.user.display_name,
:title => "Re: #{comment.diary_entry.title}")
@user_message_author = @from_user
attach_user_avatar(comment.user)
mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
:to => recipient.email,
@ -154,7 +158,6 @@ class Notifier < ActionMailer::Base
def changeset_comment_notification(comment, recipient)
with_recipient_locale recipient do
@root_url = root_url(:host => SERVER_URL)
@changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
@comment = comment.body
@owner = recipient == comment.changeset.user
@ -162,6 +165,7 @@ class Notifier < ActionMailer::Base
@changeset_comment = comment.changeset.tags["comment"].presence
@time = comment.created_at
@changeset_author = comment.changeset.user.display_name
@user_message_author = @commenter
subject = if @owner
I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@ -169,8 +173,8 @@ class Notifier < ActionMailer::Base
I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
end
attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
attach_project_logo
attach_user_avatar(comment.author)
mail :to => recipient.email, :subject => subject
end
@ -178,6 +182,19 @@ class Notifier < ActionMailer::Base
private
def set_shared_template_vars
@root_url = root_url(:host => SERVER_URL)
attach_project_logo
end
def attach_project_logo
attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
end
def attach_user_avatar(user)
attachments.inline["avatar.png"] = File.read(user_avatar_file_path(user))
end
def user_avatar_file_path(user)
image = user.image
if image.file?