From 738c03421323fdc3b474307961fdaf1dbc0c37f8 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 21 Feb 2019 19:36:48 +0100 Subject: Do not error out when performing admin actions on no statuses (#10094) Same as #8220 but for reports --- app/controllers/admin/reported_statuses_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/controllers/admin') 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 @@ -10,6 +10,10 @@ module Admin @form = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button)) 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 -- cgit From d7ad42a8884d8d77d4a1c0240e629071e82ed996 Mon Sep 17 00:00:00 2001 From: Hinaloe Date: Sat, 23 Feb 2019 00:52:04 +0900 Subject: Randomize emoji filename (#10090) --- app/controllers/admin/custom_emojis_controller.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/controllers/admin') 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]) -- cgit