IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: when filling suggested topic list, don't try to add topics that have already been added, and topics that are category descriptions

Browse Source
This commit is contained in:
Neil Lalonde 2014-01-28 18:15:36 -05:00
parent 42117c684f
commit 947d896a8c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/topic_query.rb
View File

@ -46,7 +46,7 @@ class TopicQuery
builder.add_results(unread_results(topic: topic, per_page: builder.results_left), :high) builder.add_results(unread_results(topic: topic, per_page: builder.results_left), :high)
builder.add_results(new_results(topic: topic, per_page: builder.category_results_left), :high) unless builder.category_full? builder.add_results(new_results(topic: topic, per_page: builder.category_results_left), :high) unless builder.category_full?
end end
builder.add_results(random_suggested(topic, builder.results_left), :low) unless builder.full? builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids), :low) unless builder.full?
create_list(:suggested, {}, builder.results) create_list(:suggested, {}, builder.results)
end end
@ -288,8 +288,10 @@ class TopicQuery
suggested_ordering(result, options) suggested_ordering(result, options)
end end
def random_suggested(topic, count) def random_suggested(topic, count, excluded_topic_ids=[])
result = default_results(unordered: true, per_page: count) result = default_results(unordered: true, per_page: count)
excluded_topic_ids += Category.pluck(:topic_id).compact
result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
# If we are in a category, prefer it for the random results # If we are in a category, prefer it for the random results
if topic.category_id if topic.category_id