techhub/mastodon
2
0
Fork 0
Code Activity

Fix error handling for blank actions in account moderation action form (#35246)

Browse Source
This commit is contained in:
Claire
2025-07-03 16:42:48 +02:00
parent 000ff9c05f
commit 42884d8727
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/admin/account_actions_controller.rb
View File

@@ -14,16 +14,20 @@ module Admin
def create
authorize @account, :show?
account_action = Admin::AccountAction.new(resource_params)
account_action.target_account = @account
account_action.current_account = current_account
@account_action = Admin::AccountAction.new(resource_params)
@account_action.target_account = @account
@account_action.current_account = current_account
account_action.save!
if account_action.with_report?
redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: resource_params[:report_id])
if @account_action.save
if @account_action.with_report?
redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: resource_params[:report_id])
else
redirect_to admin_account_path(@account.id)
end
else
redirect_to admin_account_path(@account.id)
@warning_presets = AccountWarningPreset.all
render :new
end
end