X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..9a9b045372a6f48420a9a6dacfde52c34ab7abce:/app/models/note_comment.rb

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index bcbcf79be..31ee6f99b 100644
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -1,21 +1,17 @@
 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
-  validates_uniqueness_of :id
-  validates_presence_of :note_id
-  validates_associated :note
-  validates_presence_of :visible
-  validates_associated :author
-  validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ]
+  validates :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :note, :presence => true, :associated => true
+  validates :visible, :inclusion => [true, false]
+  validates :author, :associated => true
+  validates :event, :inclusion => %w(opened closed reopened commented hidden)
+  validates :body, :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
 
-  # Return the author name
-  def author_name
-    if self.author_id.nil?
-      self.read_attribute(:author_name)
-    else
-      self.author.display_name
-    end
+  # Return the comment text
+  def body
+    RichText.new("text", self[:body])
   end
 end