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

Renamed @user_message_author to @author as suggested

Browse source
This commit is contained in:
Herve Saint-Amand 2017-01-16 21:13:52 +00:00
parent a0627ec0c6
commit 1e19e80d0e
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/notifier.rb
View file

@ -77,7 +77,7 @@ class Notifier < ActionMailer::Base
@replyurl = url_for(:host => SERVER_URL, @replyurl = url_for(:host => SERVER_URL,
:controller => "message", :action => "reply", :controller => "message", :action => "reply",
:message_id => message.id) :message_id => message.id)
@user_message_author = @from_user @author = @from_user
attach_user_avatar(message.sender) attach_user_avatar(message.sender)
@ -110,7 +110,7 @@ class Notifier < ActionMailer::Base
: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}")
@user_message_author = @from_user @author = @from_user
attach_user_avatar(comment.user) attach_user_avatar(comment.user)
@ -129,7 +129,7 @@ class Notifier < ActionMailer::Base
@friendurl = url_for(:host => SERVER_URL, @friendurl = url_for(:host => SERVER_URL,
:controller => "user", :action => "make_friend", :controller => "user", :action => "make_friend",
:display_name => @friend.befriender.display_name) :display_name => @friend.befriender.display_name)
@user_message_author = @friend.befriender.display_name @author = @friend.befriender.display_name
attach_user_avatar(@friend.befriender) attach_user_avatar(@friend.befriender)
mail :to => friend.befriendee.email, mail :to => friend.befriendee.email,
@ -151,7 +151,7 @@ class Notifier < ActionMailer::Base
I18n.t("notifier.note_comment_notification.anonymous") I18n.t("notifier.note_comment_notification.anonymous")
end end
@user_message_author = @commenter @author = @commenter
attach_user_avatar(comment.author) attach_user_avatar(comment.author)
subject = if @owner subject = if @owner
@ -173,7 +173,7 @@ class Notifier < ActionMailer::Base
@changeset_comment = comment.changeset.tags["comment"].presence @changeset_comment = comment.changeset.tags["comment"].presence
@time = comment.created_at @time = comment.created_at
@changeset_author = comment.changeset.user.display_name @changeset_author = comment.changeset.user.display_name
@user_message_author = @commenter @author = @commenter
subject = if @owner subject = if @owner
I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)

6
app/views/notifier/_user_message_table.html.erb
View file

@ -4,10 +4,10 @@
<%= link_to( <%= link_to(
image_tag( image_tag(
attachments["avatar.png"].url, attachments["avatar.png"].url,
alt: @user_message_author, alt: @author,
title: @user_message_author title: @author
), ),
user_url(@user_message_author, :host => SERVER_URL), user_url(@author, :host => SERVER_URL),
:target => "_blank" :target => "_blank"
) %> ) %>
</td> </td>