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

Merge pull request #2734 from evazion/fix-negated-aliases

Browse Source 
Resolve aliases when removing negated tags (fix #2730)
This commit is contained in:
Albert Yi
2016-10-24 12:21:21 -07:00
committed by GitHub
parent 95c3f5342a c6294d5dfd
commit f158e10c37
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/post.rb
View File

@@ -615,6 +615,7 @@ class Post < ActiveRecord::Base
def remove_negated_tags(tags) def remove_negated_tags(tags)
negated_tags, tags = tags.partition {|x| x =~ /\A-/i} negated_tags, tags = tags.partition {|x| x =~ /\A-/i}
negated_tags = negated_tags.map {|x| x[1..-1]} negated_tags = negated_tags.map {|x| x[1..-1]}
negated_tags = TagAlias.to_aliased(negated_tags)
return tags - negated_tags return tags - negated_tags
end end

7
test/unit/post_test.rb
View File

@@ -740,6 +740,13 @@ class PostTest < ActiveSupport::TestCase
@post.reload @post.reload
assert_equal("aaa ccc", @post.tag_string) assert_equal("aaa ccc", @post.tag_string)
end end
should "resolve aliases" do
FactoryGirl.create(:tag_alias, :antecedent_name => "/tr", :consequent_name => "translation_request")
@post.update(:tag_string => "aaa translation_request -/tr")
assert_equal("aaa", @post.tag_string)
end
end end
should "have an array representation of its tags" do should "have an array representation of its tags" do