X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/654d22ed2e30f406d036cb57273678c4406f3535..4d44f188e1b69d94ea9f364d85a57dcd262a93ba:/app/models/note_comment.rb?ds=sidebyside diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index 0500acb8b..dd91a95b4 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 @@ -9,15 +9,7 @@ class NoteComment < ActiveRecord::Base validates_presence_of :visible validates_associated :author validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ] - - # Return the author name - def author_name - if self.author_id.nil? - self.read_attribute(:author_name) - else - self.author.display_name - end - end + validates_format_of :body, :with => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/ # Return the comment text def body