X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/21bf5d79d680f7dc0447b1b5980ad5ce0a4b830c..6f0477ee72cb9f2c780342413bd6314eacb22d22:/app/models/note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index d4f9a801f..8c6137479 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -18,13 +18,14 @@
 #  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, :integer_only => true }
+                 :numericality => { :on => :update, :only_integer => true }
   validates :latitude, :longitude, :numericality => { :only_integer => true }
   validates :closed_at, :presence => true, :if => proc { :status == "closed" }
   validates :status, :inclusion => %w[open closed hidden]
@@ -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