X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/models/changeset_comment.rb?ds=inline diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb index 756fda14c..1b78f98e8 100644 --- a/app/models/changeset_comment.rb +++ b/app/models/changeset_comment.rb @@ -3,8 +3,8 @@ # Table name: changeset_comments # # id :integer not null, primary key -# changeset_id :integer not null -# author_id :integer not null +# changeset_id :bigint(8) not null +# author_id :bigint(8) not null # body :text not null # created_at :datetime not null # visible :boolean not null @@ -19,16 +19,16 @@ # changeset_comments_changeset_id_fkey (changeset_id => changesets.id) # -class ChangesetComment < ActiveRecord::Base +class ChangesetComment < ApplicationRecord belongs_to :changeset belongs_to :author, :class_name => "User" validates :id, :uniqueness => true, :presence => { :on => :update }, - :numericality => { :on => :update, :integer_only => true } - validates :changeset, :presence => true, :associated => true - validates :author, :presence => true, :associated => true + :numericality => { :on => :update, :only_integer => true } + validates :changeset, :associated => true + validates :author, :associated => true validates :visible, :inclusion => [true, false] - validates :body, :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/ + validates :body, :characters => true # Return the comment text def body