X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/note.rb?ds=inline diff --git a/app/models/note.rb b/app/models/note.rb index d96addbe7..ea88599a4 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -2,10 +2,10 @@ # # Table name: notes # -# id :integer not null, primary key +# id :bigint(8) not null, primary key # latitude :integer not null # longitude :integer not null -# tile :integer not null +# tile :bigint(8) not null # updated_at :datetime not null # created_at :datetime not null # status :enum not null @@ -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]