X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f0feca800d91ac1d23eb63ca17a45d8fd4d41920..fc891d9caae886cedf864dce7e1ec7754bac6def:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index f7584c637..58f8710f9 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -2,18 +2,10 @@ class DiaryEntry < ActiveRecord::Base belongs_to :user, :counter_cache => true belongs_to :language, :foreign_key => 'language_code' - has_many :comments, :class_name => "DiaryComment", - :include => :user, - :order => "diary_comments.id" - has_many :visible_comments, :class_name => "DiaryComment", - :include => :user, - :conditions => { - :users => { :status => ["active", "confirmed" ] }, - :visible => true - }, - :order => "diary_comments.id" - - scope :visible, where(:visible => true) + has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment" + has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => ["active", "confirmed"] }).order(:id) }, :class_name => "DiaryComment" + + scope :visible, -> { where(:visible => true) } validates_presence_of :title, :body validates_length_of :title, :within => 1..255