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/reports_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/reports_controller.rb')
| -rw-r--r-- | app/controllers/admin/reports_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 7c831b3d4..00d200d7c 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -13,8 +13,10 @@ module Admin authorize @report, :show? @report_note = @report.notes.new - @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 end def assign_to_self |