Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2022 from nickborromeo/topic-order 

Use symbols instead of strings in order clause
This commit is contained in:
Régis Hanol 2014-02-27 10:49:16 +01:00
parent ce480f8fc8 09a2d9e12c
commit 4751575ddc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/topic.rb
View File

@ -102,22 +102,22 @@ class Topic < ActiveRecord::Base
attr_accessor :include_last_poster attr_accessor :include_last_poster
# The regular order # The regular order
scope :topic_list_order, lambda { order('topics.bumped_at desc') } scope :topic_list_order, -> { order(bumped_at: :desc) }
# Return private message topics # Return private message topics
scope :private_messages, lambda { scope :private_messages, -> {
where(archetype: Archetype.private_message) where(archetype: Archetype.private_message)
} }
scope :listable_topics, lambda { where('topics.archetype <> ?', [Archetype.private_message]) } scope :listable_topics, -> { where('topics.archetype <> ?', [Archetype.private_message]) }
scope :by_newest, -> { order('topics.created_at desc, topics.id desc') } scope :by_newest, -> { order(created_at: :desc, id: :desc) }
scope :visible, -> { where(visible: true) } scope :visible, -> { where(visible: true) }
scope :created_since, lambda { |time_ago| where('created_at > ?', time_ago) } scope :created_since, -> (time_ago) { where('created_at > ?', time_ago) }
scope :secured, lambda {|guardian=nil| scope :secured, -> (guardian=nil) {
ids = guardian.secure_category_ids if guardian ids = guardian.secure_category_ids if guardian
# Query conditions # Query conditions
@ -203,11 +203,11 @@ class Topic < ActiveRecord::Base
end end
def self.top_viewed(max = 10) def self.top_viewed(max = 10)
Topic.listable_topics.visible.secured.order('views desc').limit(max) Topic.listable_topics.visible.secured.order(views: :desc).limit(max)
end end
def self.recent(max = 10) def self.recent(max = 10)
Topic.listable_topics.visible.secured.order('created_at desc').limit(max) Topic.listable_topics.visible.secured.order(created_at: :desc).limit(max)
end end
def self.count_exceeds_minimum? def self.count_exceeds_minimum?
@ -215,7 +215,7 @@ class Topic < ActiveRecord::Base
end end
def best_post def best_post
posts.order('score desc').limit(1).first posts.order(score: :desc).limit(1).first
end end
# all users (in groups or directly targetted) that are going to get the pm # all users (in groups or directly targetted) that are going to get the pm