Move #set_user to Admin::BaseController (#9470)

* Move #set_user to Admin::BaseController

* Rename Admin::TwoFactorAuthenticationsController

from `#set_user` to `#set_target_user` .
signup-info-prompt
ysksn 2018-12-17 19:40:51 +09:00 committed by Eugen Rochko
parent 0c80715235
commit 3281df0df1
5 changed files with 6 additions and 18 deletions

View File

@ -15,5 +15,9 @@ module Admin
def set_body_classes def set_body_classes
@body_classes = 'admin' @body_classes = 'admin'
end end
def set_user
@user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
end
end end
end end

View File

@ -25,10 +25,6 @@ module Admin
private private
def set_user
@user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
end
def check_confirmation def check_confirmation
if @user.confirmed? if @user.confirmed?
flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed') flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')

View File

@ -10,11 +10,5 @@ module Admin
log_action :reset_password, @user log_action :reset_password, @user
redirect_to admin_accounts_path redirect_to admin_accounts_path
end end
private
def set_user
@user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
end
end end
end end

View File

@ -17,11 +17,5 @@ module Admin
log_action :demote, @user log_action :demote, @user
redirect_to admin_account_path(@user.account_id) redirect_to admin_account_path(@user.account_id)
end end
private
def set_user
@user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
end
end end
end end

View File

@ -2,7 +2,7 @@
module Admin module Admin
class TwoFactorAuthenticationsController < BaseController class TwoFactorAuthenticationsController < BaseController
before_action :set_user before_action :set_target_user
def destroy def destroy
authorize @user, :disable_2fa? authorize @user, :disable_2fa?
@ -13,7 +13,7 @@ module Admin
private private
def set_user def set_target_user
@user = User.find(params[:user_id]) @user = User.find(params[:user_id])
end end
end end