Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-10 14:42:52 +08:00
Code Packages Activity Actions 1

FIX: Don't include shared drafts in global latest

Browse source
This commit is contained in:
Robin Ward 2018-03-26 10:43:30 -04:00
parent 2aca08b75e
commit 2b161a2391
2 changed files with 53 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/topic_query.rb
View file

@ -481,6 +481,23 @@ class TopicQuery
result
end
def apply_shared_drafts(result, category_id, options)
viewing_shared = category_id && category_id == SiteSetting.shared_drafts_category.to_i
if guardian.can_create_shared_draft?
result = result.includes(:shared_draft).references(:shared_draft)
if options[:destination_category_id]
destination_category_id = get_category_id(options[:destination_category_id])
return result.where("shared_drafts.category_id" => destination_category_id)
end
return result.where("shared_drafts.id IS NULL") unless viewing_shared
end
result
end
def apply_ordering(result, options)
sort_column = SORTABLE_MAPPING[options[:order]] || 'default'
sort_dir = (options[:ascending] == "true") ? "ASC" : "DESC"
@ -606,16 +623,7 @@ class TopicQuery
result = apply_ordering(result, options)
result = result.listable_topics.includes(:category)
# Avoid N+1 for shared drafts
if category_id && category_id == SiteSetting.shared_drafts_category.to_i
result = result.includes(:shared_draft)
end
if options[:destination_category_id]
destination_category_id = get_category_id(options[:destination_category_id])
result = result.includes(:shared_draft).where("shared_drafts.category_id" => destination_category_id)
end
result = apply_shared_drafts(result, category_id, options)
if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids]).references(:categories)