Fix batch actions not working on pending accounts (#10508)

diff --git a/app/controllers/admin/pending_accounts_controller.rb b/app/controllers/admin/pending_accounts_controller.rb
index 8429d35855a93eb53affd600868943ece7b250c4..f145108b3402636c2b2e74f3093a55cd06ecef30 100644 (file)
--- a/app/controllers/admin/pending_accounts_controller.rb
+++ b/app/controllers/admin/pending_accounts_controller.rb
@@ -8,11 +8,11 @@ module Admin
       @form = Form::AccountBatch.new
     end
 
-    def update
+    def batch
       @form = Form::AccountBatch.new(form_account_batch_params.merge(current_account: current_account, action: action_from_button))
       @form.save
     rescue ActionController::ParameterMissing
-      # Do nothing
+      flash[:alert] = I18n.t('admin.accounts.no_account_selected')
     ensure
       redirect_to admin_pending_accounts_path(current_params)
     end

diff --git a/app/views/admin/pending_accounts/index.html.haml b/app/views/admin/pending_accounts/index.html.haml
index 77b96cbca0391d5997631d4e69edf62e65c674d1..7ce5b8213aeee97350d93f44f444c62dc8d9849e 100644 (file)
--- a/app/views/admin/pending_accounts/index.html.haml
+++ b/app/views/admin/pending_accounts/index.html.haml
@@ -4,7 +4,7 @@
 - content_for :header_tags do
   = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
 
-= form_for(@form, url: admin_pending_accounts_path, method: :patch) do |f|
+= form_for(@form, url: batch_admin_pending_accounts_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
 
   .batch-table

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e56008a89b5c002baf1c9ab87c30589a4be63d13..139803affb31790e3e20ac5f03920085e165d702 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -134,6 +134,7 @@ en:
       moderation_notes: Moderation notes
       most_recent_activity: Most recent activity
       most_recent_ip: Most recent IP
+      no_account_selected: No accounts were changed as none were selected
       no_limits_imposed: No limits imposed
       not_subscribed: Not subscribed
       outbox_url: Outbox URL

diff --git a/config/routes.rb b/config/routes.rb
index 1ea6490b0ddd7b97f7131f76544e2d84611a30fe..34d0081e7702ff7224866873bf6695e61e2363c3 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -214,10 +214,11 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :pending_accounts, only: [:index, :update] do
+    resources :pending_accounts, only: [:index] do
       collection do
         post :approve_all
         post :reject_all
+        post :batch
       end
     end