adds two migrations to create old_node_tags and node_tags table and indexes. Does...

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 852ed34f8839d2a866b42df3c1e07534cc29313c..f934a8bde42a6a95939fd81c7ea2495cb8018f42 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -3,6 +3,7 @@ class Notifier < ActionMailer::Base
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Confirm your email address"
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Confirm your email address"

+    headers "Auto-Submitted" => "auto-generated"

     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "confirm",
                          :confirm_string => token.token)
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "confirm",
                          :confirm_string => token.token)


@@ -12,6 +13,7 @@ class Notifier < ActionMailer::Base
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Password reset request"
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Password reset request"

+    headers "Auto-Submitted" => "auto-generated"

     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "reset_password",
                          :email => user.email, :token => token.token)
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "reset_password",
                          :email => user.email, :token => token.token)


@@ -21,6 +23,7 @@ class Notifier < ActionMailer::Base
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Password reset"
     recipients user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] Password reset"

+    headers "Auto-Submitted" => "auto-generated"

     body :pass => pass
   end
 
     body :pass => pass
   end
 


@@ -28,6 +31,7 @@ class Notifier < ActionMailer::Base
     recipients trace.user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import success"
     recipients trace.user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import success"

+    headers "Auto-Submitted" => "auto-generated"

     body :trace_name => trace.name,
          :trace_points => trace.size,
          :possible_points => possible_points
     body :trace_name => trace.name,
          :trace_points => trace.size,
          :possible_points => possible_points


@@ -37,6 +41,7 @@ class Notifier < ActionMailer::Base
     recipients trace.user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import failure"
     recipients trace.user.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import failure"

+    headers "Auto-Submitted" => "auto-generated"

     body :trace_name => trace.name,
          :error => error
   end
     body :trace_name => trace.name,
          :error => error
   end


@@ -45,6 +50,7 @@ class Notifier < ActionMailer::Base
     recipients message.recipient.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
     recipients message.recipient.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"

+    headers "Auto-Submitted" => "auto-generated"

     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,


@@ -53,8 +59,8 @@ class Notifier < ActionMailer::Base
                              :controller => "message", :action => "read",
                              :message_id => message.id),
          :replyurl => url_for(:host => SERVER_URL,
                              :controller => "message", :action => "read",
                              :message_id => message.id),
          :replyurl => url_for(:host => SERVER_URL,

-                              :controller => "message", :action => "new",
-                              :user_id => message.from_user_id)
+                              :controller => "message", :action => "reply",
+                              :message_id => message.id)

   end
 
   def friend_notification(friend)
   end
 
   def friend_notification(friend)


@@ -64,6 +70,7 @@ class Notifier < ActionMailer::Base
     recipients befriendee.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{befriender.display_name} added you as a friend"
     recipients befriendee.email
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{befriender.display_name} added you as a friend"

+    headers "Auto-Submitted" => "auto-generated"

     body :user => befriender.display_name,
          :userurl => url_for(:host => SERVER_URL,
                              :controller => "user", :action => "view",
     body :user => befriender.display_name,
          :userurl => url_for(:host => SERVER_URL,
                              :controller => "user", :action => "view",