github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 10:22:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Site setting to always show category definitions (#10124)

Browse Source
This commit is contained in:
Mark VanLandingham 2020-06-29 13:22:02 -05:00 committed by GitHub
parent 598b7914b6
commit cd5cfc1496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/list_controller.rb
View File

@ -52,7 +52,9 @@ class ListController < ApplicationController
list_opts = build_topic_list_options
list_opts.merge!(options) if options
user = list_target_user
list_opts[:no_definitions] = true if params[:category].blank? && filter == :latest
if params[:category].blank? && filter == :latest && !SiteSetting.show_category_definitions_in_topic_lists
list_opts[:no_definitions] = true
end
list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")

3
config/site_settings.yml
View File

@ -2034,6 +2034,9 @@ uncategorized:
overridden_robots_txt:
default: ""
hidden: true
show_category_definitions_in_topic_lists:
default: false
hidden: true
user_preferences:
default_email_digest_frequency: