Merge remote-tracking branch 'upstream/pull/3557'

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

diff --git a/app/models/note.rb b/app/models/note.rb
index fa9d0b1ae6a5da75a25b02ddd6d204fe63267df8..8c61374790af4cf2b65c8099d544753136e9b995 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -18,10 +18,11 @@
 #  notes_updated_at_idx   (updated_at)
 #
 
-class Note < ActiveRecord::Base
+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, :inverse_of => :note
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
@@ -44,7 +45,7 @@ class Note < ActiveRecord::Base
   # Close a note
   def close
     self.status = "closed"
-    self.closed_at = Time.now.getutc
+    self.closed_at = Time.now.utc
     save
   end