Merge branch 'main' into glitch-soc/merge-upstream

2022-02-12 21:36:33 +01:00
parent 27803cd2b7 7396a254c1
commit c9669ee167
8 changed files with 84 additions and 49 deletions
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@ -29,8 +29,9 @@ module Admin
    end

    def after_create_redirect_path
-      if @status_batch_action.report_id.present?
-        admin_report_path(@status_batch_action.report_id)
+      report_id = @status_batch_action&.report_id || params[:report_id]
+      if report_id.present?
+        admin_report_path(report_id)
      else
        admin_account_statuses_path(params[:account_id], current_params)
      end
@ -48,6 +49,10 @@ module Admin
      params.slice(*Admin::StatusFilter::KEYS).permit(*Admin::StatusFilter::KEYS)
    end

+    def current_params
+      params.slice(:media, :page).permit(:media, :page)
+    end
+
    def action_from_button
      if params[:report]
        'report'