Include a reply link in email notifications of messages.

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index af66cd7f9e9828aaa5344fa2edf746ccdf9e82d7..9eff2fb92eb24cbf488be67240830c3e7ad6b9a8 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -39,15 +39,14 @@ class Notifier < ActionMailer::Base
   end
   
   def message_notification(message)
   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'
     @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['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
   end
 end

diff --git a/app/views/notifier/message_notification.rhtml b/app/views/notifier/message_notification.rhtml
index abbd21e5cc2c13bc14794a4a08cfc419a22fcf5d..892ac11c018d65519f21f422148971855afc3a84 100644 (file)
--- a/app/views/notifier/message_notification.rhtml
+++ b/app/views/notifier/message_notification.rhtml
@@ -6,4 +6,5 @@ Hi <%= @to_user %>,
 <%= @body %>
 ==
 
 <%= @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 %>