Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

Add a better from address to the email

Browse source
This commit is contained in:
Robin Ward 2013-02-27 18:30:14 -05:00
parent 7c1ae451fe
commit 421f048458
4 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/topic_query.rb
View file

@ -157,9 +157,13 @@ class TopicQuery
results = default_list(unordered: true, per_page: count)
.where('topics.id NOT IN (?)', exclude_topic_ids)
.where(closed: false, archived: false, visible: true)
.order('RANDOM()')
results = results.where('category_id = ?', topic.category_id) if topic.category_id.present?
if topic.category_id.present?
results = results.order("CASE WHEN topics.category_id = #{topic.category_id.to_i} THEN 0 ELSE 1 END, RANDOM()")
else
results = results.order("RANDOM()")
end
results
end