Rename user_controller to users_controller

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 3008b7fa42742c349c09dbd6d364569895d86d1e..2ff9c85d717791831cc5254576d08e73e043d4bc 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,


@@ -104,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
 


@@ -182,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")