diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 14:22:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 14:22:59 +0100 |
| commit | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (patch) | |
| tree | ccd980d2d701c03f9c16358908f20560f2d5be2c /app/controllers/admin/report_notes_controller.rb | |
| parent | f6acc039ec95c6d1c8cc2e2955f2af31d27e928c (diff) | |
| parent | c42938aed4677f52207bbb6389c7edc2772a6f7a (diff) | |
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/report_notes_controller.rb')
| -rw-r--r-- | app/controllers/admin/report_notes_controller.rb | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb index b816c5b5d..3fd815b60 100644 --- a/app/controllers/admin/report_notes_controller.rb +++ b/app/controllers/admin/report_notes_controller.rb @@ -14,20 +14,17 @@ module Admin if params[:create_and_resolve] @report.resolve!(current_account) log_action :resolve, @report - - redirect_to admin_reports_path, notice: I18n.t('admin.reports.resolved_msg') - return - end - - if params[:create_and_unresolve] + elsif params[:create_and_unresolve] @report.unresolve! log_action :reopen, @report end - redirect_to admin_report_path(@report), notice: I18n.t('admin.report_notes.created_msg') + redirect_to after_create_redirect_path, notice: I18n.t('admin.report_notes.created_msg') else - @report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at) - @form = Form::StatusBatch.new + @report_notes = @report.notes.includes(:account).order(id: :desc) + @action_logs = @report.history.includes(:target) + @form = Admin::StatusBatchAction.new + @statuses = @report.statuses.with_includes render template: 'admin/reports/show' end @@ -41,6 +38,14 @@ module Admin private + def after_create_redirect_path + if params[:create_and_resolve] + admin_reports_path + else + admin_report_path(@report) + end + end + def resource_params params.require(:report_note).permit( :content, |