X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbe165bbb3d6eda37d9579f1ac767599f9055607..c555c912047c8d0d23123093a729aa87ca642aee:/app/models/diary_entry.rb?ds=sidebyside diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 368ee3aca..143ddc1dc 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -3,7 +3,9 @@ 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 :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) }