diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-16 20:02:52 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-16 20:02:52 +0200 |
| commit | c98681c358c1f32f044992d2fe97f2e7843c83d1 (patch) | |
| tree | 32c1fb42f2f1cd87f64bf3efca9af0b9e243ca13 | |
| parent | d78474264da0bd51e021c5f04311515e10ac828e (diff) | |
Do not error out when performing admin actions on no statuses (#8220)
Fixes the other issue with #8168
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 382bfc4a2..a69f12084 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -29,6 +29,10 @@ module Admin 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 private diff --git a/config/locales/en.yml b/config/locales/en.yml index a5e4ab75d..9c2800433 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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: |