Include a reply link in email notifications of messages.
authorTom Hughes <tom@compton.nu>
Wed, 19 Sep 2007 10:37:32 +0000 (10:37 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 19 Sep 2007 10:37:32 +0000 (10:37 +0000)
app/models/notifier.rb
app/views/notifier/message_notification.rhtml

index af66cd7..9eff2fb 100644 (file)
@@ -39,15 +39,14 @@ class Notifier < ActionMailer::Base
   end
   
   def message_notification(message)
-    @from_user = User.find(message.from_user_id)
-    @to_user = User.find(message.to_user_id)
-    @recipients = @to_user.email
+    @recipients = message.recipient.email
     @from = 'abuse@openstreetmap.org'
-    @subject = "[OpenStreetMap] #{@from_user.display_name} sent you a new message"
-    @body['to_user'] = @to_user.display_name
-    @body['from_user'] = @from_user.display_name
+    @subject = "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
+    @body['to_user'] = message.recipient.display_name
+    @body['from_user'] = message.sender.display_name
     @body['body'] = message.body
     @body['subject'] = message.title
-    @body['url'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    @body['readurl'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    @body['replyurl'] = "http://#{SERVER_URL}/message/new/#{message.from_user_id}"
   end
 end
index abbd21e..892ac11 100644 (file)
@@ -6,4 +6,5 @@ Hi <%= @to_user %>,
 <%= @body %>
 ==
 
-You can also read the message at <%= @url %>
\ No newline at end of file
+You can also read the message at <%= @readurl %>
+and you can reply at <%= @replyurl %>