Merge branch 'pull/3472'

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index aeea0de0d8103224c64be540ef3ef6e1eb91415d..8c61374790af4cf2b65c8099d544753136e9b995 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -22,7 +22,7 @@ class Note < ApplicationRecord
   include GeoRecord
 
   has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
-  has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
+  has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }