X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4377e2bd55bd6bed320b7c3595087d4317b1c9bc..92102caff939beecb70a83403a58f0b60e331245:/app/models/note_comment.rb diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index 065c37a5c..635a5b0de 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -13,7 +13,7 @@ # # 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]