- {{bread-crumbs category=category categories=categories}}
+ {{bread-crumbs category=category categories=categories noSubcategories=noSubcategories}}
{{each availableNavItems itemViewClass="Discourse.NavItemView"}}
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 3b56132a737..18b0d7ddad7 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -47,11 +47,11 @@ class ListController < ApplicationController
end
def category
- list_opts = build_topic_list_options
- query = TopicQuery.new(current_user, list_opts)
- list = query.list_latest
- list.more_topics_url = construct_url_with(:latest, list_opts)
- respond(list)
+ category_response
+ end
+
+ def category_none
+ category_response(no_subcategories: true)
end
def category_feed
@@ -74,6 +74,15 @@ class ListController < ApplicationController
protected
+ def category_response(extra_opts=nil)
+ list_opts = build_topic_list_options
+ list_opts.merge!(extra_opts) if extra_opts
+ query = TopicQuery.new(current_user, list_opts)
+ list = query.list_latest
+ list.more_topics_url = construct_url_with(:latest, list_opts)
+ respond(list)
+ end
+
def respond(list)
list.draft_key = Draft::NEW_TOPIC
@@ -128,14 +137,16 @@ class ListController < ApplicationController
menu_item = menu_items.select { |item| item.query_should_exclude_category?(action_name, params[:format]) }.first
# exclude_category = 1. from params / 2. parsed from top menu / 3. nil
- return {
+ result = {
page: params[:page],
topic_ids: param_to_integer_list(:topic_ids),
exclude_category: (params[:exclude_category] || menu_item.try(:filter)),
category: params[:category],
sort_order: params[:sort_order],
- sort_descending: params[:sort_descending]
+ sort_descending: params[:sort_descending],
}
+ result[:no_subcategories] = true if params[:no_subcategories] == 'true'
+ result
end
def list_target_user
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index af37bf5adf7..2e564140bba 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -185,7 +185,8 @@ en:
categories:
all: "all categories"
- only_category: "only {{categoryName}}"
+ all_subcategories: "all subcategories"
+ no_subcategory: "no subcategory"
category: "Category"
posts: "Posts"
topics: "Topics"
diff --git a/config/routes.rb b/config/routes.rb
index d4dcb3a2133..d91aa179362 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -200,6 +200,7 @@ Discourse::Application.routes.draw do
get 'category/:category.rss' => 'list#category_feed', format: :rss, as: 'category_feed'
get 'category/:category' => 'list#category', as: 'category_list'
+ get 'category/:category/none' => 'list#category_none', as: 'category_list_none'
get 'category/:category/more' => 'list#category', as: 'category_list_more'
# We've renamed popular to latest. If people access it we want a permanent redirect.
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 83ec32431da..ab6bb25bcc1 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -17,6 +17,7 @@ class TopicQuery
visible
category
sort_order
+ no_subcategories
sort_descending).map(&:to_sym)
# Maps `sort_order` to a columns in `topics`
@@ -31,7 +32,6 @@ class TopicQuery
def initialize(user=nil, options={})
options.assert_valid_keys(VALID_OPTIONS)
-
@options = options
@user = user
end
@@ -209,12 +209,16 @@ class TopicQuery
category_id = nil
if options[:category].present?
category_id = options[:category].to_i
- if category_id == 0
- result = result.where('categories.slug = ?', options[:category])
- else
- result = result.where('categories.id = ?', category_id)
+ category_id = Category.where(slug: options[:category]).pluck(:id).first if category_id == 0
+
+ if category_id
+ if options[:no_subcategories]
+ result = result.where('categories.id = ?', category_id)
+ else
+ result = result.where('categories.id = ? or categories.parent_category_id = ?', category_id, category_id)
+ end
+ result = result.references(:categories)
end
- result = result.references(:categories)
end
result = apply_ordering(result, options)
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 0ef4402a47e..d58ba3ef514 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -41,6 +41,7 @@ describe TopicQuery do
context 'category filter' do
let(:category) { Fabricate(:category) }
+
let(:diff_category) { Fabricate(:category) }
it "returns topics in the category when we filter to it" do
@@ -50,9 +51,21 @@ describe TopicQuery do
TopicQuery.new(moderator, category: category.slug).list_latest.topics.size.should == 1
TopicQuery.new(moderator, category: "#{category.id}-category").list_latest.topics.size.should == 1
TopicQuery.new(moderator, category: diff_category.slug).list_latest.topics.size.should == 1
- TopicQuery.new(moderator, category: 'made up slug').list_latest.topics.size.should == 0
+
+ # Defaults to no category filter when slug does not exist
+ TopicQuery.new(moderator, category: 'made up slug').list_latest.topics.size.should == 2
end
+ context 'subcategories' do
+ let!(:subcategory) { Fabricate(:category, parent_category_id: category.id)}
+
+ it "works with subcategories" do
+ TopicQuery.new(moderator, category: category.id).list_latest.topics.size.should == 2
+ 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
+ end
+
+ end
end