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

Fix #4508: Specific tag not showing a wiki.

Browse Source 
Fix the wiki excerpt not appearing when searching for a tag that doesn't
exist in the tag list. This could happen if someone created a wiki for a
tag that has never been used on a post.
This commit is contained in:
evazion
2020-06-27 02:01:34 -05:00
parent f06e322dc0
commit ff096b8adc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,8 @@ module PostSets
end end
def wiki_page def wiki_page
return nil unless tag.present? && tag.wiki_page.present? return nil unless normalized_query.has_single_tag?
return nil unless !tag.wiki_page.is_deleted? @wiki_page ||= WikiPage.undeleted.find_by(title: normalized_query.tags.first.name)
tag.wiki_page
end end
def tag def tag

7
test/functional/posts_controller_test.rb
View File

@@ -96,6 +96,13 @@ class PostsControllerTest < ActionDispatch::IntegrationTest
assert_response :success assert_response :success
end end
should "show the wiki excerpt for a wiki page without a tag" do
as(@user) { create(:wiki_page, title: "no_tag") }
get posts_path(tags: "no_tag")
assert_select "#show-excerpt-link", count: 1
assert_select "#excerpt", count: 1
end
should "show a notice for a single tag search with a pending BUR" do should "show a notice for a single tag search with a pending BUR" do
create(:bulk_update_request, script: "create alias foo -> bar") create(:bulk_update_request, script: "create alias foo -> bar")
get_auth posts_path(tags: "foo"), @user get_auth posts_path(tags: "foo"), @user