X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3c01d2e80dc0e5b6942eb7b965c991f5eba5fef2..fb4ea1a02ac5dc1b0ef444e0d63fafa8f756fa8d:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 48f3e69bd..143ddc1dc 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -3,8 +3,8 @@ class DiaryEntry < ActiveRecord::Base belongs_to :language, :foreign_key => "language_code" has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment" - has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w(active confirmed) }).order(:id) }, :class_name => "DiaryComment" - has_many :subscriptions, :class_name => 'DiaryEntrySubscription' + has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w[active confirmed] }).order(:id) }, :class_name => "DiaryComment" + has_many :subscriptions, :class_name => "DiaryEntrySubscription" has_many :subscribers, :through => :subscriptions, :source => :user scope :visible, -> { where(:visible => true) }