* Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements
		
			
				
	
	
		
			57 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
module Admin
 | 
						|
  class ReportNotesController < BaseController
 | 
						|
    before_action :set_report_note, only: [:destroy]
 | 
						|
 | 
						|
    def create
 | 
						|
      authorize ReportNote, :create?
 | 
						|
 | 
						|
      @report_note = current_account.report_notes.new(resource_params)
 | 
						|
      @report = @report_note.report
 | 
						|
 | 
						|
      if @report_note.save
 | 
						|
        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]
 | 
						|
          @report.unresolve!
 | 
						|
          log_action :reopen, @report
 | 
						|
        end
 | 
						|
 | 
						|
        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
 | 
						|
 | 
						|
        render template: 'admin/reports/show'
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    def destroy
 | 
						|
      authorize @report_note, :destroy?
 | 
						|
      @report_note.destroy!
 | 
						|
      redirect_to admin_report_path(@report_note.report_id), notice: I18n.t('admin.report_notes.destroyed_msg')
 | 
						|
    end
 | 
						|
 | 
						|
    private
 | 
						|
 | 
						|
    def resource_params
 | 
						|
      params.require(:report_note).permit(
 | 
						|
        :content,
 | 
						|
        :report_id
 | 
						|
      )
 | 
						|
    end
 | 
						|
 | 
						|
    def set_report_note
 | 
						|
      @report_note = ReportNote.find(params[:id])
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |