X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f..45487e1ff8e7d334792440a2b5b3b1067269bfaf:/app/models/note_comment.rb?ds=inline diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index 388f890a6..635a5b0de 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -23,13 +23,13 @@ # note_comments_note_id_fkey (note_id => notes.id) # -class NoteComment < ActiveRecord::Base - belongs_to :note, :foreign_key => :note_id, :touch => true - belongs_to :author, :class_name => "User", :foreign_key => :author_id +class NoteComment < ApplicationRecord + belongs_to :note, :touch => true + belongs_to :author, :class_name => "User", :optional => true validates :id, :uniqueness => true, :presence => { :on => :update }, - :numericality => { :on => :update, :integer_only => true } - validates :note, :presence => true, :associated => true + :numericality => { :on => :update, :only_integer => true } + validates :note, :associated => true validates :visible, :inclusion => [true, false] validates :author, :associated => true validates :event, :inclusion => %w[opened closed reopened commented hidden]