IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

TWEAK: Don't show subcategory topic definitions when viewing a category list.

Browse Source
This commit is contained in:
Robin Ward 2014-06-30 15:22:40 -04:00
parent 952426d358
commit 0f52f26587
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/topic_query.rb
View File

@ -238,7 +238,7 @@ class TopicQuery
if options[:no_subcategories] if options[:no_subcategories]
result = result.where('categories.id = ?', category_id) result = result.where('categories.id = ?', category_id)
else else
result = result.where('categories.id = ? or categories.parent_category_id = ?', category_id, category_id) result = result.where('categories.id = ? or (categories.parent_category_id = ? AND categories.topic_id <> topics.id)', category_id, category_id)
end end
result = result.references(:categories) result = result.references(:categories)
end end

2
spec/components/topic_query_spec.rb
View File

@ -61,7 +61,7 @@ describe TopicQuery do
let!(:subcategory) { Fabricate(:category, parent_category_id: category.id)} let!(:subcategory) { Fabricate(:category, parent_category_id: category.id)}
it "works with subcategories" do it "works with subcategories" do
TopicQuery.new(moderator, category: category.id).list_latest.topics.size.should == 2 TopicQuery.new(moderator, category: category.id).list_latest.topics.size.should == 1
TopicQuery.new(moderator, category: subcategory.id).list_latest.topics.size.should == 1 TopicQuery.new(moderator, category: subcategory.id).list_latest.topics.size.should == 1
TopicQuery.new(moderator, category: category.id, no_subcategories: true).list_latest.topics.size.should == 1 TopicQuery.new(moderator, category: category.id, no_subcategories: true).list_latest.topics.size.should == 1
end end