cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename user#view to user#show

Browse source
This commit is contained in:
Andy Allan 2018-09-05 14:21:01 +08:00
parent 6027c42ee7
commit 19c26e70a3
18 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/user_controller.rb
View file

@ -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]
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
@ -409,7 +409,7 @@ class UserController < ApplicationController
render :xml => doc.to_s
end
def view
def show
@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
redirect_to :action => "view"
redirect_to :action => "show"
end
end
else
@ -463,7 +463,7 @@ class UserController < ApplicationController
if params[:referer]
redirect_to params[:referer]
else
redirect_to :action => "view"
redirect_to :action => "show"
end
end
else
@ -476,14 +476,14 @@ class UserController < ApplicationController
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
redirect_to :action => "view", :display_name => params[:display_name]
redirect_to user_path(:display_name => params[:display_name])
end
##
@ -757,7 +757,7 @@ class UserController < ApplicationController
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