mirror of
				https://github.com/mastodon/mastodon.git
				synced 2025-10-31 13:18:18 +00:00 
			
		
		
		
	Move #set_user to Admin::BaseController (#9470)
* Move #set_user to Admin::BaseController * Rename Admin::TwoFactorAuthenticationsController from `#set_user` to `#set_target_user` .
This commit is contained in:
		
							parent
							
								
									0c80715235
								
							
						
					
					
						commit
						3281df0df1
					
				|  | @ -15,5 +15,9 @@ module Admin | |||
|     def set_body_classes | ||||
|       @body_classes = 'admin' | ||||
|     end | ||||
| 
 | ||||
|     def set_user | ||||
|       @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound) | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -25,10 +25,6 @@ module Admin | |||
| 
 | ||||
|     private | ||||
| 
 | ||||
|     def set_user | ||||
|       @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound) | ||||
|     end | ||||
| 
 | ||||
|     def check_confirmation | ||||
|       if @user.confirmed? | ||||
|         flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed') | ||||
|  |  | |||
|  | @ -10,11 +10,5 @@ module Admin | |||
|       log_action :reset_password, @user | ||||
|       redirect_to admin_accounts_path | ||||
|     end | ||||
| 
 | ||||
|     private | ||||
| 
 | ||||
|     def set_user | ||||
|       @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound) | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -17,11 +17,5 @@ module Admin | |||
|       log_action :demote, @user | ||||
|       redirect_to admin_account_path(@user.account_id) | ||||
|     end | ||||
| 
 | ||||
|     private | ||||
| 
 | ||||
|     def set_user | ||||
|       @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound) | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| 
 | ||||
| module Admin | ||||
|   class TwoFactorAuthenticationsController < BaseController | ||||
|     before_action :set_user | ||||
|     before_action :set_target_user | ||||
| 
 | ||||
|     def destroy | ||||
|       authorize @user, :disable_2fa? | ||||
|  | @ -13,7 +13,7 @@ module Admin | |||
| 
 | ||||
|     private | ||||
| 
 | ||||
|     def set_user | ||||
|     def set_target_user | ||||
|       @user = User.find(params[:user_id]) | ||||
|     end | ||||
|   end | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 ysksn
						ysksn