diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-26 21:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 21:40:28 +0100 |
| commit | ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716 (patch) | |
| tree | 75adb7dc4d3c37ecf87b43659538e20ec198d804 /app/controllers/admin | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | 1e06ca1c0af98cf61b1114b93249fb447e795edb (diff) | |
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |