diff options
| author | Reverite <github@reverite.sh> | 2019-02-27 17:06:25 -0800 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-02-27 17:06:25 -0800 |
| commit | 715c552fe4c1b2d59bf1f281d77b6e2546bdb531 (patch) | |
| tree | 44e93d767f1b7cda48ff24020faa62675dd6140c /app/controllers/admin | |
| parent | 54e480ca0939ba737f5abdf4ee861cd63c025865 (diff) | |
| parent | 76ed481aa7b67d624675cdaa85bac583853fd24d (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/admin/reported_statuses_controller.rb | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index d61bafdf0..f77699166 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -5,6 +5,9 @@ module Admin before_action :set_custom_emoji, except: [:index, :new, :create] before_action :set_filter_params + include ObfuscateFilename + obfuscate_filename [:custom_emoji, :image] + def index authorize :custom_emoji, :index? @custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]) diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb index d3c2f5e9e..3ba9f5df2 100644 --- a/app/controllers/admin/reported_statuses_controller.rb +++ b/app/controllers/admin/reported_statuses_controller.rb @@ -11,6 +11,10 @@ module Admin flash[:alert] = I18n.t('admin.statuses.failed_to_execute') unless @form.save redirect_to admin_report_path(@report) + rescue ActionController::ParameterMissing + flash[:alert] = I18n.t('admin.statuses.no_status_selected') + + redirect_to admin_report_path(@report) end private |