github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:34:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: tracked filter did not account for max_category_nesting of 3 (#16963)

Browse Source
This commit is contained in:
Alan Guo Xiang Tan
2022-06-01 12:09:58 +08:00
committed by GitHub
parent 7b4e338c0e
commit 7ae647d092
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/topic_query.rb
View File

@ -346,16 +346,22 @@ class TopicQuery
end
def self.tracked_filter(list, user_id)
tracked_category_ids_sql = <<~SQL
SELECT cd.category_id FROM category_users cd
WHERE cd.user_id = :user_id AND cd.notification_level >= :tracking
SQL
has_sub_sub_categories = SiteSetting.max_category_nesting == 3
sql = +<<~SQL
topics.category_id IN (
SELECT cu.category_id FROM category_users cu
WHERE cu.user_id = :user_id AND cu.notification_level >= :tracking
)
OR topics.category_id IN (
SELECT c.id FROM categories c WHERE c.parent_category_id IN (
SELECT cd.category_id FROM category_users cd
WHERE cd.user_id = :user_id AND cd.notification_level >= :tracking
)
SELECT
c.id
FROM categories c
#{has_sub_sub_categories ? "LEFT JOIN categories parent_categories ON parent_categories.id = c.parent_category_id" : ""}
WHERE (c.parent_category_id IS NULL AND c.id IN (#{tracked_category_ids_sql}))
OR c.parent_category_id IN (#{tracked_category_ids_sql})
#{has_sub_sub_categories ? "OR (parent_categories.id IS NOT NULL AND parent_categories.parent_category_id IN (#{tracked_category_ids_sql}))" : ""}
)
SQL