Include message body in notification emails for convenience.

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 00bec921c022d02f9b9e3cd6e54669266375b585..af66cd7f9e9828aaa5344fa2edf746ccdf9e82d7 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -46,6 +46,7 @@ class Notifier < ActionMailer::Base
     @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
+    @body['body'] = message.body
     @body['subject'] = message.title
     @body['url'] = "http://#{SERVER_URL}/message/read/#{message.id}"
   end

diff --git a/app/views/notifier/message_notification.rhtml b/app/views/notifier/message_notification.rhtml
index 79a03d0f18ee7ad78983293cbfdfa686e86b135a..abbd21e5cc2c13bc14794a4a08cfc419a22fcf5d 100644 (file)
--- a/app/views/notifier/message_notification.rhtml
+++ b/app/views/notifier/message_notification.rhtml
@@ -1,5 +1,9 @@
 Hi <%= @to_user %>,
 
-<%= @from_user %> has sent you a message through OpenStreetMap with the subject "<%= @subject %>". You can read the message at:
+<%= @from_user %> has sent you a message through OpenStreetMap with the subject "<%= @subject %>":
 
-<%= @url %>
\ No newline at end of file
+==
+<%= @body %>
+==
+
+You can also read the message at <%= @url %>
\ No newline at end of file