Merge remote-tracking branch 'parent/stable-4.2' into upstream-4.2.2-lts
This commit is contained in:
commit
9310c1c81b
39 changed files with 460 additions and 98 deletions
|
@ -21,7 +21,7 @@ module Admin
|
|||
account_action.save!
|
||||
|
||||
if account_action.with_report?
|
||||
redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: params[:report_id])
|
||||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue