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

FEATURE: show pinned topics for TL0 on top/year page

Browse Source 
BUGFIX: word-wrap on topic-excerpt
This commit is contained in:
Régis Hanol
2014-01-18 19:03:09 +01:00
parent 59ab71b060
commit b49e448556
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/topic_query.rb
View File

@@ -82,9 +82,12 @@ class TopicQuery
def list_top_for(period)
score = "#{period}_score"
create_list(:top, unordered: true) do |topics|
topics.joins(:top_topic)
.where("top_topics.#{score} > 0")
.order("top_topics.#{score} DESC, topics.bumped_at DESC")
topics = topics.joins(:top_topic).where("top_topics.#{score} > 0")
if period == :yearly && @user.try(:trust_level) == TrustLevel.levels[:newuser]
topics.order(TopicQuerySQL.order_top_with_pinned_category_for(score))
else
topics.order(TopicQuerySQL.order_top_for(score))
end
end
end