Add methods to get a bug's author details from the first comment

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 26c236b7ad48f5550cae088a6644bc4a5b5d8093..e8c9259cbe2aa7107c08ff7bc803d8cabf86e3b3 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -97,18 +97,18 @@ class Notifier < ActionMailer::Base
 
   def bug_comment_notification(bug_comment, recipient)
     common_headers recipient
 
   def bug_comment_notification(bug_comment, recipient)
     common_headers recipient

-    owner = (recipient == bug_comment.map_bug.comments.first.user);
-    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.commenter_name) if owner
-    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.commenter_name) unless owner
+    owner = (recipient == bug_comment.map_bug.author);
+    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.author_name) if owner
+    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.author_name) unless owner

 
     body :bugurl => url_for(:host => SERVER_URL,
                             :controller => "browse",
                             :action => "bug",
                             :id => bug_comment.bug_id),
          :place => bug_comment.map_bug.nearby_place,
 
     body :bugurl => url_for(:host => SERVER_URL,
                             :controller => "browse",
                             :action => "bug",
                             :id => bug_comment.bug_id),
          :place => bug_comment.map_bug.nearby_place,

-         :comment => bug_comment.comment,
+         :comment => bug_comment.body,

          :owner => owner,
          :owner => owner,

-         :commenter => bug_comment.commenter_name
+         :commenter => bug_comment.author_name

   end
 
 private
   end
 
 private