From c98681c358c1f32f044992d2fe97f2e7843c83d1 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 16 Aug 2018 20:02:52 +0200
Subject: [PATCH] Do not error out when performing admin actions on no statuses
(#8220)
Fixes the other issue with #8168
---
app/controllers/admin/statuses_controller.rb | 4 ++++
config/locales/en.yml | 1 +
2 files changed, 5 insertions(+)
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 382bfc4a23..a69f120845 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -28,6 +28,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_account_statuses_path(@account.id, current_params)
+ rescue ActionController::ParameterMissing
+ flash[:alert] = I18n.t('admin.statuses.no_status_selected')
+
redirect_to admin_account_statuses_path(@account.id, current_params)
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a5e4ab75d6..9c2800433e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -401,6 +401,7 @@ en:
media:
title: Media
no_media: No media
+ no_status_selected: No statuses were changed as none were selected
title: Account statuses
with_media: With media
subscriptions:
--
GitLab