X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56db9ca2b7e2475cd8025630049fb4a4b824f2d9..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/note_comment.rb diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index 399029118..192064864 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -1,5 +1,5 @@ class NoteComment < ActiveRecord::Base - belongs_to :note, :foreign_key => :note_id + belongs_to :note, :foreign_key => :note_id, :touch => true belongs_to :author, :class_name => "User", :foreign_key => :author_id validates_presence_of :id, :on => :update @@ -8,7 +8,8 @@ class NoteComment < ActiveRecord::Base validates_associated :note validates_presence_of :visible validates_associated :author - validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ] + validates_inclusion_of :event, :in => %w(opened closed reopened commented hidden) + validates_format_of :body, :with => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/ # Return the comment text def body