Add explicit primary key declaration for changeset subscriptions

[rails.git] / app / models / note_comment.rb

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 07d43cd741da065ada41e4705b458874f5ca3756..aa8635aadde724c6bbb233650460d27a2471b49b 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -2,16 +2,16 @@ class NoteComment < ActiveRecord::Base
   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 comment text
   def body
-    RichText.new("text", read_attribute(:body))
+    RichText.new("text", self[:body])
   end
 end