FIX: Display top posts from private categories if the user has access. (#14878)
Users viewing the top topics from the categories page should see those belonging to a private category if they have access to it.
This commit is contained in:
parent
69ec6899f9
commit
a3814b1e56
|
@ -279,7 +279,9 @@ class CategoriesController < ApplicationController
|
|||
if topics_filter == :latest
|
||||
result.topic_list = TopicQuery.new(current_user, topic_options).list_latest
|
||||
elsif topics_filter == :top
|
||||
result.topic_list = TopicQuery.new(nil, topic_options).list_top_for(SiteSetting.top_page_default_timeframe.to_sym)
|
||||
result.topic_list = TopicQuery.new(current_user, topic_options).list_top_for(
|
||||
SiteSetting.top_page_default_timeframe.to_sym
|
||||
)
|
||||
end
|
||||
|
||||
render_serialized(result, CategoryAndTopicListsSerializer, root: false)
|
||||
|
|
|
@ -633,5 +633,23 @@ describe CategoriesController do
|
|||
get "/categories_and_latest.json"
|
||||
expect(response.parsed_body["category_list"]["categories"].map { |x| x['id'] }).not_to include(uncategorized.id)
|
||||
end
|
||||
|
||||
describe 'Showing top topics from private categories' do
|
||||
it 'returns the top topic from the private category when the user is a member' do
|
||||
restricted_group = Fabricate(:group)
|
||||
private_cat = Fabricate(:private_category, group: restricted_group)
|
||||
private_topic = Fabricate(:topic, category: private_cat, like_count: 1000, posts_count: 100)
|
||||
TopTopic.refresh!
|
||||
restricted_group.add(user)
|
||||
sign_in(user)
|
||||
|
||||
get "/categories_and_top.json"
|
||||
parsed_topic = response.parsed_body.dig('topic_list', 'topics').detect do |t|
|
||||
t.dig('id') == private_topic.id
|
||||
end
|
||||
|
||||
expect(parsed_topic).to be_present
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue