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

FIX: if exclude_category_ids is specified pass it through 

This allows us to optionally show all topics on latest even if stuff is
suppressed via a plugin
This commit is contained in:
Sam 2018-07-23 17:23:00 +10:00
parent ab5d40c319
commit caa669cf29
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/list_controller.rb
View File

@ -64,7 +64,7 @@ class ListController < ApplicationController
if filter == :latest if filter == :latest
list_opts[:no_definitions] = true list_opts[:no_definitions] = true
end end
if [:latest, :categories].include?(filter) if [:latest, :categories].include?(filter) && list_opts[:exclude_category_ids].blank?
list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category]) list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category])
end end
end end
@ -264,7 +264,7 @@ class ListController < ApplicationController
top_options.merge!(options) if options top_options.merge!(options) if options
top_options[:per_page] = SiteSetting.topics_per_period_in_top_page top_options[:per_page] = SiteSetting.topics_per_period_in_top_page
if "top".freeze == current_homepage if "top".freeze == current_homepage && top_options[:exclude_category_ids].blank?
top_options[:exclude_category_ids] = get_excluded_category_ids(top_options[:category]) top_options[:exclude_category_ids] = get_excluded_category_ids(top_options[:category])
end end