diff options
| author | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
| commit | 73f4af117fc5b5e4ee3337d634f5e589a9353644 (patch) | |
| tree | 62b0443573ba5038fd45aa14d4243dfc832c060a /app/controllers/admin/report_notes_controller.rb | |
| parent | 849e2bc4ca11892e701835a4696904d78b1ad325 (diff) | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/admin/report_notes_controller.rb')
| -rw-r--r-- | app/controllers/admin/report_notes_controller.rb | 9 |
1 files changed, 4 insertions, 5 deletions
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 |