X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a3eb48385bcf1465339d473c0c1657e075cd507d..862f46cd500ec211a6154095f7acb3b25abd8d95:/app/models/changeset_comment.rb

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index a010674a3..2fedadff0 100644
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -2,16 +2,15 @@ class ChangesetComment < ActiveRecord::Base
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
-  validates_presence_of :id, :on => :update # is it necessary?
-  validates_uniqueness_of :id
-  validates_presence_of :changeset
-  validates_associated :changeset
-  validates_presence_of :author
-  validates_associated :author
-  validates :visible, :inclusion => { :in => [true,false] }
-  
+  validates :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :changeset, :presence => true, :associated => true
+  validates :author, :presence => true, :associated => true
+  validates :visible, :inclusion => [true, false]
+  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