X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e3b8b8933044104bb515d34c3d36851caba78ac7..8e404f3a468a2636481d52f245b816c41e9d5ac0:/app/models/note_comment.rb

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 5e04723bd..192064864 100644
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -1,17 +1,18 @@
 class NoteComment < ActiveRecord::Base
-  belongs_to :note, :foreign_key => :bug_id
+  belongs_to :note, :foreign_key => :note_id, :touch => true
   belongs_to :author, :class_name => "User", :foreign_key => :author_id
 
-  validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ]
   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 => %w(opened closed reopened commented hidden)
+  validates_format_of :body, :with => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
 
-  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", read_attribute(:body))
   end
 end