Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

Revert "FEATURE: new setting to prioritize open topics in search"

Browse source
This commit is contained in:
Arpit Jalan 2017-06-03 01:54:35 +05:30 • committed by GitHub
parent 44cf0bdf9e
commit a1ebd67237
4 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/locales/server.en.yml
View file

@ -938,7 +938,6 @@ en:
search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites" search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites"
search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first" search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first"
search_recent_posts_size: "How many recent posts to keep in the index" search_recent_posts_size: "How many recent posts to keep in the index"
prioritize_open_topics_in_search: "Closed topics in search results will show up after open topics"
allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off." allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
unique_posts_mins: "How many minutes before a user can make a post with the same content again" unique_posts_mins: "How many minutes before a user can make a post with the same content again"

1
config/site_settings.yml
View file

@ -1132,7 +1132,6 @@ search:
search_tokenize_chinese_japanese_korean: false search_tokenize_chinese_japanese_korean: false
search_prefer_recent_posts: false search_prefer_recent_posts: false
search_recent_posts_size: 100000 search_recent_posts_size: 100000
prioritize_open_topics_in_search: false
uncategorized: uncategorized:
version_checks: version_checks:

2
lib/search.rb
View file

@ -694,8 +694,6 @@ class Search
posts = posts.order("posts.like_count DESC") posts = posts.order("posts.like_count DESC")
end end
else else
posts = posts.order("topics.closed") if SiteSetting.prioritize_open_topics_in_search
posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC") posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC")
data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})" data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"

20
spec/components/search_spec.rb
View file

@ -662,26 +662,6 @@ describe Search do
expect(Search.execute('Topic order:latest_topic').posts.map(&:id)).to eq([latest_irelevant_topic_post.id, old_relevant_topic_post.id]) expect(Search.execute('Topic order:latest_topic').posts.map(&:id)).to eq([latest_irelevant_topic_post.id, old_relevant_topic_post.id])
end end
context 'can prioritize open topics in search' do
before do
open_topic = Fabricate(:topic, title: 'Open Topic, testing prioritize open topics setting')
closed_topic = Fabricate(:topic, title: 'Closed Topic, testing prioritize open topics setting', closed: true)
@open_irrelevant_topic_post = Fabricate(:post, topic: open_topic, raw: 'Not Relevant')
@closed_relevant_topic_post = Fabricate(:post, topic: closed_topic, raw: 'Relevant Topic')
end
it "when prioritize_open_topics_in_search is disabled" do
SiteSetting.prioritize_open_topics_in_search = false
expect(Search.execute('Topic').posts.map(&:id)).to eq([@closed_relevant_topic_post.id, @open_irrelevant_topic_post.id])
end
it "when prioritize_open_topics_in_search is enabled" do
SiteSetting.prioritize_open_topics_in_search = true
expect(Search.execute('Topic').posts.map(&:id)).to eq([@open_irrelevant_topic_post.id, @closed_relevant_topic_post.id])
end
end
it 'can tokenize dots' do it 'can tokenize dots' do
post = Fabricate(:post, raw: 'Will.2000 Will.Bob.Bill...') post = Fabricate(:post, raw: 'Will.2000 Will.Bob.Bill...')
expect(Search.execute('bill').posts.map(&:id)).to eq([post.id]) expect(Search.execute('bill').posts.map(&:id)).to eq([post.id])