diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-05 15:23:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 15:23:27 +0200 |
| commit | bf6745b9c326e64b819a381a0558cc87c99be4be (patch) | |
| tree | 1502504967828c16117431d8f37bedb8143c8532 /app/controllers | |
| parent | aed3a436a2dbef40096ec8596cec08e185efe936 (diff) | |
Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)
* Display appropriate error when performing unpermitted operation on custom emoji Fixes #13897 * Remove links to custom emoji actions not performable by moderators
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index efa8f2950..71efb543e 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -33,6 +33,8 @@ module Admin @form.save rescue ActionController::ParameterMissing flash[:alert] = I18n.t('admin.accounts.no_account_selected') + rescue Mastodon::NotPermittedError + flash[:alert] = I18n.t('admin.custom_emojis.not_permitted') ensure redirect_to admin_custom_emojis_path(filter_params) end |