FEATURE: Re-prioritize related so unread is always first

This commit is contained in:
Sam 2014-12-04 10:04:23 +11:00
parent 8977d5917b
commit 228f7542da
2 changed files with 2 additions and 10 deletions

View File

@ -70,14 +70,6 @@ class SuggestedTopicsBuilder
SiteSetting.suggested_topics - @results.count{|r| r.category_id == @category_id} SiteSetting.suggested_topics - @results.count{|r| r.category_id == @category_id}
end end
def category_full?
if @category_id
else
full?
end
end
def size def size
@results.size @results.size
end end

View File

@ -56,9 +56,9 @@ class TopicQuery
# When logged in we start with different results # When logged in we start with different results
if @user if @user
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)) unless builder.full?
end end
builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids), :low) unless builder.full? builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids)) unless builder.full?
create_list(:suggested, {}, builder.results) create_list(:suggested, {}, builder.results)
end end