From 27d8f2ef63d4544f53410f78621bbf89caa347c9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 19 Sep 2007 10:37:32 +0000 Subject: [PATCH 1/1] Include a reply link in email notifications of messages. --- app/models/notifier.rb | 13 ++++++------- app/views/notifier/message_notification.rhtml | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models/notifier.rb b/app/models/notifier.rb index af66cd7f9..9eff2fb92 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -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 diff --git a/app/views/notifier/message_notification.rhtml b/app/views/notifier/message_notification.rhtml index abbd21e5c..892ac11c0 100644 --- a/app/views/notifier/message_notification.rhtml +++ b/app/views/notifier/message_notification.rhtml @@ -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 %> -- 2.43.2