diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-14 17:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 17:34:53 +0100 |
| commit | 80c4db160ecfd201cb82ed320cbe3eb32236ad20 (patch) | |
| tree | 2121840d15230e64af66761ac62b1e65938e211b /app/controllers | |
| parent | 76d6fe63c3a4a68bb26eb8eeea35e52207e35cbc (diff) | |
Fix blank screen when trying to copy emoji with a too large file size (#1718)
Fixes #1714
Diffstat (limited to 'app/controllers')
| -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 |