From 4e9ebbd02e875e3a008e3bc359f439be8419b3b6 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Thu, 16 Nov 2017 14:44:57 -0800 Subject: [PATCH] include creator in bulk revert messages --- app/controllers/moderator/bulk_reverts_controller.rb | 2 +- app/logical/bulk_revert.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/moderator/bulk_reverts_controller.rb b/app/controllers/moderator/bulk_reverts_controller.rb index c496f92bbb2..2e856861805 100644 --- a/app/controllers/moderator/bulk_reverts_controller.rb +++ b/app/controllers/moderator/bulk_reverts_controller.rb @@ -15,7 +15,7 @@ def create @bulk_revert.preview render action: "new" else - @bulk_revert.delay(:queue => "default", :priority => 15).process(@constraints) + @bulk_revert.delay(:queue => "default", :priority => 15).process(CurrentUser.user, @constraints) flash[:notice] = "Reverts queued" redirect_to new_moderator_bulk_revert_path end diff --git a/app/logical/bulk_revert.rb b/app/logical/bulk_revert.rb index 29a3a8549c3..aacfdfc535e 100644 --- a/app/logical/bulk_revert.rb +++ b/app/logical/bulk_revert.rb @@ -4,12 +4,12 @@ class BulkRevert class ConstraintTooGeneralError < Exception ; end - def process(constraints) + def process(creator, constraints) @constraints = constraints - ModAction.log("Processed bulk revert for #{constraints.inspect}") + ModAction.log("Processed bulk revert for #{constraints.inspect} by #{creator.name}") - CurrentUser.scoped(User.system, "127.0.0.1") do + CurrentUser.scoped(creator) do ActiveRecord::Base.without_timeout do find_post_versions.order("updated_at, id").each do |version| version.undo!