mirror of https://github.com/mastodon/mastodon.git
Do not error out when performing admin actions on no statuses (#8220)
Fixes the other issue with #8168pull/8230/merge
parent
d78474264d
commit
c98681c358
|
@ -28,6 +28,10 @@ module Admin
|
||||||
@form = Form::StatusBatch.new(form_status_batch_params.merge(current_account: current_account, action: action_from_button))
|
@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
|
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)
|
redirect_to admin_account_statuses_path(@account.id, current_params)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -401,6 +401,7 @@ en:
|
||||||
media:
|
media:
|
||||||
title: Media
|
title: Media
|
||||||
no_media: No media
|
no_media: No media
|
||||||
|
no_status_selected: No statuses were changed as none were selected
|
||||||
title: Account statuses
|
title: Account statuses
|
||||||
with_media: With media
|
with_media: With media
|
||||||
subscriptions:
|
subscriptions:
|
||||||
|
|
Loading…
Reference in New Issue