Rename user#view to user#show

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 7e22c63b4a56d75e33bacc376699d2aec248b721..644c62b6f99e324214c7cb62f00d76748e9cb49c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -18,7 +18,7 @@ class UserController < ApplicationController
   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]
   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]

-  before_action :allow_thirdparty_images, :only => [:view, :account]
+  before_action :allow_thirdparty_images, :only => [:show, :account]

 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE


@@ -409,7 +409,7 @@ class UserController < ApplicationController
     render :xml => doc.to_s
   end
 
     render :xml => doc.to_s
   end
 

-  def view
+  def show

     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&
     @user = User.find_by(:display_name => params[:display_name])
 
     if @user &&


@@ -440,7 +440,7 @@ class UserController < ApplicationController
         if params[:referer]
           redirect_to params[:referer]
         else
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :action => "view"
+          redirect_to :action => "show"

         end
       end
     else
         end
       end
     else


@@ -463,7 +463,7 @@ class UserController < ApplicationController
         if params[:referer]
           redirect_to params[:referer]
         else
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :action => "view"
+          redirect_to :action => "show"

         end
       end
     else
         end
       end
     else


@@ -476,14 +476,14 @@ class UserController < ApplicationController
   def set_status
     @user.status = params[:status]
     @user.save
   def set_status
     @user.status = params[:status]
     @user.save

-    redirect_to :action => "view", :display_name => params[:display_name]
+    redirect_to user_path(:display_name => params[:display_name])

   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @user.delete
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @user.delete

-    redirect_to :action => "view", :display_name => params[:display_name]
+    redirect_to user_path(:display_name => params[:display_name])

   end
 
   ##
   end
 
   ##


@@ -757,7 +757,7 @@ class UserController < ApplicationController
       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]
       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]

-        redirect_to :action => "view", :display_name => params[:display_name]
+        redirect_to user_path(:display_name => params[:display_name])

       else
         redirect_to :action => "login", :referer => request.fullpath
       end
       else
         redirect_to :action => "login", :referer => request.fullpath
       end