From c1a8800bf8453c0c2e81f2b17d8351d507b63a80 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 28 May 2017 11:55:05 -0500 Subject: [PATCH 1/2] mass updates: fix exception when moving saved searches. --- app/logical/moderator/tag_batch_change.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/logical/moderator/tag_batch_change.rb b/app/logical/moderator/tag_batch_change.rb index 81bb10df6..9fdf1897b 100644 --- a/app/logical/moderator/tag_batch_change.rb +++ b/app/logical/moderator/tag_batch_change.rb @@ -25,7 +25,7 @@ module Moderator conds = [conds, *tags.map {|x| "%#{x.to_escaped_for_sql_like}%"}] if SavedSearch.enabled? SavedSearch.where(*conds).find_each do |ss| - ss.query = (ss.query_array - tags + [consequent]).uniq.join(" ") + ss.query = (ss.query.split - tags + [consequent]).uniq.join(" ") ss.save end end From 88d14b30ed3992b0325b2785638ab12aa259062d Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 28 May 2017 11:56:44 -0500 Subject: [PATCH 2/2] mass updates: log modaction after update successfully completes. --- app/logical/moderator/tag_batch_change.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/logical/moderator/tag_batch_change.rb b/app/logical/moderator/tag_batch_change.rb index 9fdf1897b..230db6f01 100644 --- a/app/logical/moderator/tag_batch_change.rb +++ b/app/logical/moderator/tag_batch_change.rb @@ -12,8 +12,6 @@ module Moderator CurrentUser.without_safe_mode do CurrentUser.scoped(updater, updater_ip_addr) do - ModAction.log("processed mass update: #{antecedent} -> #{consequent}") - ::Post.tag_match(antecedent).where("true /* Moderator::TagBatchChange#perform */").find_each do |post| post.reload tags = (post.tag_array - normalized_antecedent + normalized_consequent).join(" ") @@ -31,6 +29,8 @@ module Moderator end end end + + ModAction.log("processed mass update: #{antecedent} -> #{consequent}") end end end