gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 01:41:08 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Combine assignment params in admin/accounts#batch action (#35463)

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-23 03:59:14 -04:00 committed by GitHub
parent b19131202f
commit d065ec9298
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/admin/accounts_controller.rb
View File

@ -16,11 +16,14 @@ module Admin
def batch def batch
authorize :account, :index? authorize :account, :index?
@form = Form::AccountBatch.new(form_account_batch_params) @form = Form::AccountBatch.new(
@form.current_account = current_account form_account_batch_params.merge(
@form.action = action_from_button action: action_from_button,
@form.select_all_matching = params[:select_all_matching] current_account:,
@form.query = filtered_accounts query: filtered_accounts,
select_all_matching: params[:select_all_matching]
)
)
@form.save @form.save
rescue ActionController::ParameterMissing rescue ActionController::ParameterMissing
flash[:alert] = I18n.t('admin.accounts.no_account_selected') flash[:alert] = I18n.t('admin.accounts.no_account_selected')