FEATURE: Hide Privacy Policy and TOS topics (#18533)
* FEATURE: Hide Privacy Policy and TOS topics As a way to simplify new sites this change will hide the privacy policy and the TOS topics from the topic list. They can still be accessed and edited though. * add tests
This commit is contained in:
parent
cab173d3b5
commit
49abcf965b
|
@ -438,6 +438,9 @@ class TopicQuery
|
|||
|
||||
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]
|
||||
user_ids = []
|
||||
topics.each do |ft|
|
||||
|
|
|
@ -79,6 +79,19 @@ RSpec.describe ListController do
|
|||
expect(parsed["topic_list"]["topics"].length).to eq(1)
|
||||
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
|
||||
get "/latest"
|
||||
|
||||
|
|
Loading…
Reference in New Issue