diff options
| author | Starfall <us@starfall.systems> | 2022-03-22 11:16:06 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-22 11:16:06 -0500 |
| commit | f37056e6c351a08d09c3986586cc7d27bdea85ab (patch) | |
| tree | c28aaff7e0b70ba0fea07d4335777e6676bff60e /app/controllers/admin/custom_emojis_controller.rb | |
| parent | 239d67fc2c0ec82617de50a9831bc1a9efc30ecc (diff) | |
| parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 71efb543e..47138bf6c 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -35,6 +35,9 @@ module Admin flash[:alert] = I18n.t('admin.accounts.no_account_selected') rescue Mastodon::NotPermittedError flash[:alert] = I18n.t('admin.custom_emojis.not_permitted') + rescue ActiveRecord::RecordInvalid => e + error_message = action_from_button == 'copy' ? 'admin.custom_emojis.batch_copy_error' : 'admin.custom_emojis.batch_error' + flash[:alert] = I18n.t(error_message, message: e.message) ensure redirect_to admin_custom_emojis_path(filter_params) end |