From: ThibG Date: Thu, 21 Feb 2019 18:36:48 +0000 (+0100) Subject: Do not error out when performing admin actions on no statuses (#10094) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=738c03421323fdc3b474307961fdaf1dbc0c37f8;p=mastodon.git Do not error out when performing admin actions on no statuses (#10094) Same as #8220 but for reports --- diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb index d3c2f5e9e..3ba9f5df2 100644 --- a/app/controllers/admin/reported_statuses_controller.rb +++ b/app/controllers/admin/reported_statuses_controller.rb @@ -10,6 +10,10 @@ module Admin @form = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button)) flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save + redirect_to admin_report_path(@report) + rescue ActionController::ParameterMissing + flash[:alert] = I18n.t('admin.statuses.no_status_selected') + redirect_to admin_report_path(@report) end