Browse Source

Do not error out when performing admin actions on no statuses (#8220)

Fixes the other issue with #8168
master
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
c98681c358
2 changed files with 5 additions and 0 deletions
  1. +4
    -0
      app/controllers/admin/statuses_controller.rb
  2. +1
    -0
      config/locales/en.yml

+ 4
- 0
app/controllers/admin/statuses_controller.rb View File

@ -28,6 +28,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_account_statuses_path(@account.id, current_params)
rescue ActionController::ParameterMissing
flash[:alert] = I18n.t('admin.statuses.no_status_selected')
redirect_to admin_account_statuses_path(@account.id, current_params)
end

+ 1
- 0
config/locales/en.yml View File

@ -401,6 +401,7 @@ en:
media:
title: Media
no_media: No media
no_status_selected: No statuses were changed as none were selected
title: Account statuses
with_media: With media
subscriptions:

Loading…
Cancel
Save