diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-11 16:32:44 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-27 13:55:39 -0600 |
| commit | 3681f7dcce8f82d2a4377a051952159cd03919c0 (patch) | |
| tree | 1e11fbf90b822450b0e736408cb17442babc54a6 /app/controllers | |
| parent | 422b59808b4818171e057e1a459de153816bf505 (diff) | |
port tootsuite#11805 to monserfork: Change deletes to preserve soft-deleted statuses in unresolved reports
Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/report_notes_controller.rb | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 25cb2fb72..584fb3361 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -41,7 +41,7 @@ module Admin def reject authorize @account.user, :reject? - SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true) + SuspendAccountService.new.call(@account, reserve_email: false, reserve_username: false) redirect_to admin_pending_accounts_path end diff --git a/app/controllers/admin/report_notes_controller.rb b/app/controllers/admin/report_notes_controller.rb index bcb3f2026..b816c5b5d 100644 --- a/app/controllers/admin/report_notes_controller.rb +++ b/app/controllers/admin/report_notes_controller.rb @@ -5,10 +5,10 @@ module Admin before_action :set_report_note, only: [:destroy] def create - authorize ReportNote, :create? + authorize :report_note, :create? @report_note = current_account.report_notes.new(resource_params) - @report = @report_note.report + @report = @report_note.report if @report_note.save if params[:create_and_resolve] @@ -26,9 +26,8 @@ module Admin redirect_to admin_report_path(@report), notice: I18n.t('admin.report_notes.created_msg') else - @report_notes = @report.notes.latest - @report_history = @report.history - @form = Form::StatusBatch.new + @report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at) + @form = Form::StatusBatch.new render template: 'admin/reports/show' end |