X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbea796ef412840af9a3ec2fd26bf08657fc4cd3..c8e21c409c9bec446f0caa2526d5b07861bb3299:/app/models/note.rb?ds=sidebyside diff --git a/app/models/note.rb b/app/models/note.rb index d4f9a801f..ea88599a4 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 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]