X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d73a5d4bc015d304e7b8863a0e927ac0b134e07b..7dbf65c8f372f99876e0b1ec8e1a73e6b5d96de8:/app/models/note_comment.rb?ds=sidebyside diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index f94032e1e..635a5b0de 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -2,18 +2,18 @@ # # Table name: note_comments # -# id :integer not null, primary key -# note_id :integer not null +# id :bigint(8) not null, primary key +# note_id :bigint(8) not null # visible :boolean not null # created_at :datetime not null # author_ip :inet -# author_id :integer +# author_id :bigint(8) # body :text # event :enum # # Indexes # -# index_note_comments_on_body (to_tsvector('english'::regconfig, body)) +# index_note_comments_on_body (to_tsvector('english'::regconfig, body)) USING gin # index_note_comments_on_created_at (created_at) # note_comments_note_id_idx (note_id) # @@ -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]