Merge remote-tracking branch 'upstream/pull/2014'

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 0944c3e1d27a273de56eebb3cc2c4fad8e840e6b..4b53c66f6825f1b38d5fdbde69653002762e9896 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -8,7 +8,7 @@ class Notifier < ActionMailer::Base
 
   def signup_confirm(user, token)
     with_recipient_locale user do
 
   def signup_confirm(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "user", :action => "confirm",
+      @url = url_for(:controller => "users", :action => "confirm",

                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 


@@ -20,7 +20,7 @@ class Notifier < ActionMailer::Base
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email

-      @url = url_for(:controller => "user", :action => "confirm_email",
+      @url = url_for(:controller => "users", :action => "confirm_email",

                      :confirm_string => token.token)
 
       mail :to => user.new_email,
                      :confirm_string => token.token)
 
       mail :to => user.new_email,


@@ -30,7 +30,7 @@ class Notifier < ActionMailer::Base
 
   def lost_password(user, token)
     with_recipient_locale user do
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = url_for(:controller => "user", :action => "reset_password",
+      @url = url_for(:controller => "users", :action => "reset_password",

                      :token => token.token)
 
       mail :to => user.email,
                      :token => token.token)
 
       mail :to => user.email,


@@ -69,8 +69,8 @@ class Notifier < ActionMailer::Base
       @from_user = message.sender.display_name
       @text = message.body
       @title = message.title
       @from_user = message.sender.display_name
       @text = message.body
       @title = message.title

-      @readurl = read_message_url(message)
-      @replyurl = reply_message_url(message)
+      @readurl = message_url(message)
+      @replyurl = message_reply_url(message)

       @author = @from_user
 
       attach_user_avatar(message.sender)
       @author = @from_user
 
       attach_user_avatar(message.sender)


@@ -87,16 +87,8 @@ class Notifier < ActionMailer::Base
       @from_user = comment.user.display_name
       @text = comment.body
       @title = comment.diary_entry.title
       @from_user = comment.user.display_name
       @text = comment.body
       @title = comment.diary_entry.title

-      @readurl = url_for(:controller => "diary_entry",
-                         :action => "view",
-                         :display_name => comment.diary_entry.user.display_name,
-                         :id => comment.diary_entry.id,
-                         :anchor => "comment#{comment.id}")
-      @commenturl = url_for(:controller => "diary_entry",
-                            :action => "view",
-                            :display_name => comment.diary_entry.user.display_name,
-                            :id => comment.diary_entry.id,
-                            :anchor => "newcomment")
+      @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
+      @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")

       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
 
       @author = @from_user
       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
 
       @author = @from_user


@@ -112,9 +104,8 @@ class Notifier < ActionMailer::Base
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend
   def friend_notification(friend)
     with_recipient_locale friend.befriendee do
       @friend = friend

-      @viewurl = url_for(:controller => "user", :action => "view",
-                         :display_name => @friend.befriender.display_name)
-      @friendurl = url_for(:controller => "user", :action => "make_friend",
+      @viewurl = user_url(@friend.befriender)
+      @friendurl = url_for(:controller => "users", :action => "make_friend",

                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name
 
                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name
 


@@ -190,8 +181,8 @@ class Notifier < ActionMailer::Base
   end
 
   def user_avatar_file_path(user)
   end
 
   def user_avatar_file_path(user)

-    image = user && user.image
-    if image && image.file?
+    image = user&.image
+    if image&.file?

       return image.path(:small)
     else
       return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
       return image.path(:small)
     else
       return Rails.root.join("app", "assets", "images", "users", "images", "small.png")