diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-28 13:27:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 13:27:17 +0200 |
| commit | 215738bb3cba4951e84174b461da5f1004b0649e (patch) | |
| tree | ceca848b6a0553474e2b228dbf8c9e9c144cc99f /app/controllers/admin/accounts_controller.rb | |
| parent | 54d9a9c18a74a1ec766d8f611ad3ee11ab4c5422 (diff) | |
| parent | 54ae7a221e862990550850500d70997c70187b70 (diff) | |
Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/accounts_controller.rb')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 46c9aba91..40bf685c5 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -16,7 +16,11 @@ module Admin def batch authorize :account, :index? - @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button)) + @form = Form::AccountBatch.new(form_account_batch_params) + @form.current_account = current_account + @form.action = action_from_button + @form.select_all_matching = params[:select_all_matching] + @form.query = filtered_accounts @form.save rescue ActionController::ParameterMissing flash[:alert] = I18n.t('admin.accounts.no_account_selected') |