jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3097 from evazion/fix-mass-update

Browse Source 
Mass updates: fix exception when moving saved searches.
This commit is contained in:
Albert Yi
2017-05-30 11:41:16 -07:00
committed by GitHub
parent 2e78542a68 88d14b30ed
commit 7a3431caaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/moderator/tag_batch_change.rb
View File

@@ -12,8 +12,6 @@ module Moderator
CurrentUser.without_safe_mode do CurrentUser.without_safe_mode do
CurrentUser.scoped(updater, updater_ip_addr) 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.tag_match(antecedent).where("true /* Moderator::TagBatchChange#perform */").find_each do |post|
post.reload post.reload
tags = (post.tag_array - normalized_antecedent + normalized_consequent).join(" ") tags = (post.tag_array - normalized_antecedent + normalized_consequent).join(" ")
@@ -25,12 +23,14 @@ module Moderator
conds = [conds, *tags.map {|x| "%#{x.to_escaped_for_sql_like}%"}] conds = [conds, *tags.map {|x| "%#{x.to_escaped_for_sql_like}%"}]
if SavedSearch.enabled? if SavedSearch.enabled?
SavedSearch.where(*conds).find_each do |ss| 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 ss.save
end end
end end
end end
end end
ModAction.log("processed mass update: #{antecedent} -> #{consequent}")
end end
end end
end end