Reposition the note and user report flags

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index d7fa66c4ad431332455b354528cd10cef97a5aaa..8f9e3e2954814e45151632c0ba88ca0db8fa6dfd 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,6 +4,7 @@ class Notifier < ActionMailer::Base
           :auto_submitted => "auto-generated"
   helper :application
   before_action :set_shared_template_vars
           :auto_submitted => "auto-generated"
   helper :application
   before_action :set_shared_template_vars

+  before_action :attach_project_logo

 
   def signup_confirm(user, token)
     with_recipient_locale user do
 
   def signup_confirm(user, token)
     with_recipient_locale user do


@@ -77,7 +78,7 @@ class Notifier < ActionMailer::Base
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)

-      @user_message_author = @from_user
+      @author = @from_user

 
       attach_user_avatar(message.sender)
 
 
       attach_user_avatar(message.sender)
 


@@ -110,7 +111,7 @@ class Notifier < ActionMailer::Base
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :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 +130,7 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)

-      @user_message_author = @friend.befriender.display_name
+      @author = @friend.befriender.display_name

 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,


@@ -151,6 +152,9 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 

+      @author = @commenter
+      attach_user_avatar(comment.author)
+

       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
                 else
       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
                 else


@@ -171,7 +175,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name

-      @user_message_author = @commenter
+      @author = @commenter

 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)


@@ -179,7 +183,6 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 

-      attach_project_logo

       attach_user_avatar(comment.author)
 
       mail :to => recipient.email, :subject => subject
       attach_user_avatar(comment.author)
 
       mail :to => recipient.email, :subject => subject


@@ -190,11 +193,10 @@ class Notifier < ActionMailer::Base
 
   def set_shared_template_vars
     @root_url = root_url(:host => SERVER_URL)
 
   def set_shared_template_vars
     @root_url = root_url(:host => SERVER_URL)

-    attach_project_logo

   end
 
   def attach_project_logo
   end
 
   def attach_project_logo

-    attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
+    attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))

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


@@ -202,11 +204,11 @@ class Notifier < ActionMailer::Base
   end
 
   def user_avatar_file_path(user)
   end
 
   def user_avatar_file_path(user)

-    image = user.image
-    if image.file?
+    image = user && user.image
+    if image && image.file?

       return image.path(:small)
     else
       return image.path(:small)
     else

-      return "#{Rails.root}/app/assets/images/users/images/small.png"
+      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")

     end
   end
 
     end
   end