Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FEATURE: Hide Privacy Policy and TOS topics (#18533)" (#18633) 

This reverts commit 49abcf965b.
This commit is contained in:
Blake Erickson 2022-10-17 17:26:34 -06:00 committed by GitHub
parent 868ab26fb3
commit 124ee4b7bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/topic_query.rb
View File

@ -438,9 +438,6 @@ class TopicQuery
topics = topics.to_a topics = topics.to_a
# These don't need to be shown in the topic list
topics = topics.reject { |t| [SiteSetting.privacy_topic_id, SiteSetting.tos_topic_id].include?(t[:id]) }
if options[:preload_posters] if options[:preload_posters]
user_ids = [] user_ids = []
topics.each do |ft| topics.each do |ft|

13
spec/requests/list_controller_spec.rb
View File

@ -79,19 +79,6 @@ RSpec.describe ListController do
expect(parsed["topic_list"]["topics"].length).to eq(1) expect(parsed["topic_list"]["topics"].length).to eq(1)
end end
it 'filters out privacy policy and tos topics' do
tos_topic = create_topic
SiteSetting.tos_topic_id = tos_topic.id
pp_topic = create_topic
SiteSetting.privacy_topic_id = pp_topic.id
get "/latest.json"
expect(response.status).to eq(200)
parsed = response.parsed_body
expect(parsed["topic_list"]["topics"].length).to eq(1)
end
it "shows correct title if topic list is set for homepage" do it "shows correct title if topic list is set for homepage" do
get "/latest" get "/latest"