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

fix tests

Browse Source
This commit is contained in:
r888888888
2017-03-15 16:08:47 -07:00
parent da06bee0ab
commit d9a26975ba
9 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,11 +21,11 @@ module Moderator
end
tags = Tag.scan_tags(antecedent, :strip_metatags => true)
conds = tags.map {|x| "tag_query like ?"}.join(" AND ")
conds = tags.map {|x| "query like ?"}.join(" AND ")
conds = [conds, *tags.map {|x| "%#{x.to_escaped_for_sql_like}%"}]
if SavedSearch.enabled?
SavedSearch.where(*conds).find_each do |ss|
ss.tag_query = (ss.tag_query_array - tags + [consequent]).uniq.join(" ")
ss.query = (ss.query_array - tags + [consequent]).uniq.join(" ")
ss.save
end
end

4
app/models/tag_alias.rb
View File

@@ -182,8 +182,8 @@ class TagAlias < ActiveRecord::Base
escaped = Regexp.escape(antecedent_name)
if SavedSearch.enabled?
SavedSearch.where("tag_query like ?", "%#{antecedent_name}%").find_each do |ss|
ss.tag_query = ss.tag_query.sub(/(?:^| )#{escaped}(?:$| )/, " #{consequent_name} ").strip.gsub(/ /, " ")
SavedSearch.where("query like ?", "%#{antecedent_name}%").find_each do |ss|
ss.query = ss.query.sub(/(?:^| )#{escaped}(?:$| )/, " #{consequent_name} ").strip.gsub(/ /, " ")
ss.save
end
end