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

Use user_account_path for links to settings page

Browse source 
Much easier to read than having to be explicit about controllers etc
This commit is contained in:
Andy Allan 2021-08-12 17:09:07 +01:00
parent ebb25a095c
commit d797de4317
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/confirmations_controller.rb
View file

@ -93,10 +93,10 @@ class ConfirmationsController < ApplicationController
current_user.tokens.delete_all
session[:user] = current_user.id
session[:fingerprint] = current_user.fingerprint
redirect_to :controller => :users, :action => :account, :display_name => current_user.display_name
redirect_to user_account_path(current_user)
elsif token
flash[:error] = t "confirmations.confirm_email.failure"
redirect_to :controller => :users, :action => :account, :display_name => token.user.display_name
redirect_to user_account_path(token.user)
else
flash[:error] = t "confirmations.confirm_email.unknown_token"
end

10
app/controllers/users_controller.rb
View file

@ -28,7 +28,7 @@ class UsersController < ApplicationController
if current_user&.terms_agreed?
# Already agreed to terms, so just show settings
redirect_to :action => :account, :display_name => current_user.display_name
redirect_to user_account_path(current_user)
elsif current_user.nil? && session[:new_user].nil?
redirect_to login_path(:referer => request.fullpath)
end
@ -47,7 +47,7 @@ class UsersController < ApplicationController
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to :action => :account, :display_name => current_user.display_name
redirect_to user_account_path(current_user)
end
elsif params[:decline]
redirect_to t("users.terms.declined")
@ -67,7 +67,7 @@ class UsersController < ApplicationController
if params[:referer]
redirect_to safe_referer(params[:referer])
else
redirect_to :action => :account, :display_name => current_user.display_name
redirect_to user_account_path(current_user)
end
else
self.current_user = session.delete(:new_user)
@ -147,7 +147,7 @@ class UsersController < ApplicationController
current_user.data_public = true
current_user.save
flash[:notice] = t "users.go_public.flash success"
redirect_to :action => "account", :display_name => current_user.display_name
redirect_to user_account_path(current_user)
end
def new
@ -297,7 +297,7 @@ class UsersController < ApplicationController
session[:user_errors] = current_user.errors.as_json
redirect_to :action => "account", :display_name => current_user.display_name
redirect_to user_account_path(current_user)
elsif session[:new_user]
session[:new_user].auth_provider = provider
session[:new_user].auth_uid = uid