luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 04:43:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix empty batch statuses selection causing a 500 error (#17532)

Browse source 
* Fix empty batch statuses selection causing a 500 error

* Simplify current_params
This commit is contained in:
Claire 2022-02-12 19:52:17 +01:00 committed by GitHub
parent 38845592c4
commit 7396a254c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/admin/statuses_controller.rb
View file

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