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 d3c975df98255cd6c0a0e8258a12d98bb211f218..e8c9259cbe2aa7107c08ff7bc803d8cabf86e3b3 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -97,20 +97,18 @@ class Notifier < ActionMailer::Base
 
   def bug_comment_notification(bug_comment, recipient)
     common_headers recipient
-    commenter_name = bug_comment.user.display_name if bug_comment.user
-    commenter_name = bug_comment.commenter_name unless bug_comment.user
-       owner = (recipient == bug_comment.map_bug.map_bug_comment[0].user);
-    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => commenter_name) if owner
-    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => 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,
-         :comment => bug_comment.comment,
+         :comment => bug_comment.body,
          :owner => owner,
-         :commenter => commenter_name
+         :commenter => bug_comment.author_name
   end
 
 private