Add basic logging of who resolved report
This commit is contained in:
		@@ -16,19 +16,19 @@ class Admin::ReportsController < ApplicationController
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def resolve
 | 
			
		||||
    @report.update(action_taken: true)
 | 
			
		||||
    @report.update(action_taken: true, action_taken_by_account_id: current_account.id)
 | 
			
		||||
    redirect_to admin_report_path(@report)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def suspend
 | 
			
		||||
    Admin::SuspensionWorker.perform_async(@report.target_account.id)
 | 
			
		||||
    Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true)
 | 
			
		||||
    Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true, action_taken_by_account_id: current_account.id)
 | 
			
		||||
    redirect_to admin_report_path(@report)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def silence
 | 
			
		||||
    @report.target_account.update(silenced: true)
 | 
			
		||||
    Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true)
 | 
			
		||||
    Report.unresolved.where(target_account: @report.target_account).update_all(action_taken: true, action_taken_by_account_id: current_account.id)
 | 
			
		||||
    redirect_to admin_report_path(@report)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@
 | 
			
		||||
class Report < ApplicationRecord
 | 
			
		||||
  belongs_to :account
 | 
			
		||||
  belongs_to :target_account, class_name: 'Account'
 | 
			
		||||
  belongs_to :action_taken_by_account, class_name: 'Account'
 | 
			
		||||
 | 
			
		||||
  scope :unresolved, -> { where(action_taken: false) }
 | 
			
		||||
  scope :resolved,   -> { where(action_taken: true) }
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@
 | 
			
		||||
        = link_to remove_admin_report_path(@report, status_id: status.id), method: :post, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: 'Delete' do
 | 
			
		||||
          = fa_icon 'trash'
 | 
			
		||||
 | 
			
		||||
- unless @report.action_taken?
 | 
			
		||||
- if !@report.action_taken?
 | 
			
		||||
  %hr/
 | 
			
		||||
 | 
			
		||||
  %div{ style: 'overflow: hidden' }
 | 
			
		||||
@@ -36,3 +36,9 @@
 | 
			
		||||
      = link_to 'Suspend account', suspend_admin_report_path(@report), method: :post, class: 'button'
 | 
			
		||||
    %div{ style: 'float: left' }
 | 
			
		||||
      = link_to 'Mark as resolved', resolve_admin_report_path(@report), method: :post, class: 'button'
 | 
			
		||||
- elsif !@report.action_taken_by_account.nil?
 | 
			
		||||
  %hr/
 | 
			
		||||
 | 
			
		||||
  %p
 | 
			
		||||
    %strong Action taken by:
 | 
			
		||||
    = @report.action_taken_by_account.acct
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user