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

#1140: Remove order metatag when picking reltag method

Browse Source
This commit is contained in:
Toks
2013-12-09 12:43:27 -05:00
parent cc2443e3af
commit ace1975704
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/post_sets/post.rb
View File

@@ -18,6 +18,10 @@ module PostSets
tag_array.slice(0, 25).join(" ").tr("_", " ") tag_array.slice(0, 25).join(" ").tr("_", " ")
end end
def unordered_tag_array
tag_array.reject{|tag| tag =~ /\Aorder:\S+/}
end
def has_wiki? def has_wiki?
is_single_tag? && ::WikiPage.titled(tag_string).exists? is_single_tag? && ::WikiPage.titled(tag_string).exists?
end end

8
app/presenters/post_set_presenters/post.rb
View File

@@ -14,7 +14,9 @@ module PostSetPresenters
elsif post_set.is_tag_subscription? elsif post_set.is_tag_subscription?
post_set.tag_subscription_tags post_set.tag_subscription_tags
elsif post_set.is_single_tag? elsif post_set.is_single_tag?
related_tags_for_single related_tags_for_single(post_set.tag_string)
elsif post_set.unordered_tag_array.size == 1
related_tags_for_single(post_set.unordered_tag_array.first)
elsif post_set.tag_string =~ /(?:^|\s)(?:#{Tag::SUBQUERY_METATAGS}):\S+/ elsif post_set.tag_string =~ /(?:^|\s)(?:#{Tag::SUBQUERY_METATAGS}):\S+/
calculate_related_tags_from_post_set calculate_related_tags_from_post_set
elsif post_set.is_empty_tag? elsif post_set.is_empty_tag?
@@ -36,8 +38,8 @@ module PostSetPresenters
RelatedTagCalculator.calculate_from_sample_to_array(post_set.tag_string).map(&:first) RelatedTagCalculator.calculate_from_sample_to_array(post_set.tag_string).map(&:first)
end end
def related_tags_for_single def related_tags_for_single(tag_string)
tag = Tag.find_by_name(post_set.tag_string.downcase) tag = Tag.find_by_name(tag_string.downcase)
if tag if tag
tag.related_tag_array.map(&:first) tag.related_tag_array.map(&:first)