Merge pull request #3485 from evazion/fix-3484

Fix #3484: /posts: don't show wiki tab for metatags
This commit is contained in:
Albert Yi
2018-01-02 10:45:06 -08:00
committed by GitHub
2 changed files with 11 additions and 12 deletions

View File

@@ -29,6 +29,10 @@ module PostSets
is_single_tag? && ::WikiPage.titled(tag_string).exists? && wiki_page.visible?
end
def has_blank_wiki?
is_simple_tag? && !has_wiki?
end
def wiki_page
if is_single_tag?
::WikiPage.titled(tag_string).first
@@ -142,22 +146,17 @@ module PostSets
end
def hide_from_crawler?
return true if !is_single_tag?
return true if is_pattern_search?
return true if page.to_i > 1
return true if is_metatag_search?
false
end
def is_metatag_search?
# filter out some common metatags
tag_string =~ /(?:rating|user|fav|status|order|source|score|width|height):/
!is_simple_tag? || page.to_i > 1
end
def is_single_tag?
tag_array.size == 1
end
def is_simple_tag?
Tag.is_simple_tag?(tag_string)
end
def is_empty_tag?
tag_array.size == 0
end

View File

@@ -29,8 +29,8 @@
<li><%= link_to "Pool", pool_path(@post_set.pool), :id => "show-excerpt-link" %></li>
<% elsif @post_set.has_favgroup? %>
<li><%= link_to "Favorite Group", favorite_group_path(@post_set.favgroup), :id => "show-excerpt-link" %></li>
<% elsif @post_set.is_single_tag? && !@post_set.is_metatag_search? %>
<li><%= link_to "Wiki", "#", :id => "show-excerpt-link" %></li>
<% elsif @post_set.has_blank_wiki? %>
<li><%= link_to "Wiki", new_wiki_page_path(wiki_page: { title: @post_set.tag_string }), id: "show-excerpt-link" %></li>
<% end %>
<li id="searchbox-redirect-link"><a href="#search-box">Search&raquo;</a></li>