Merge remote-tracking branch 'openstreetmap/pull/903'

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 075d288edb8e0b644970b7b515a4f6967506abbe..2796eb612ac8eea869270fc7cee2f72bb73b6da8 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,15 +2,13 @@ class DiaryComment < ActiveRecord::Base
   belongs_to :user
   belongs_to :diary_entry
 
   belongs_to :user
   belongs_to :diary_entry
 

-  validates_presence_of :body
-  validates_associated :diary_entry
+  validates :body, :presence => true
+  validates :diary_entry, :user, :associated => true

 
 

-  attr_accessible :body
-
-  after_initialize :set_defaults
+  after_save :spam_check

 
   def body
 
   def body

-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])

   end
 
   def digest
   end
 
   def digest


@@ -22,9 +20,9 @@ class DiaryComment < ActiveRecord::Base
     md5.hexdigest
   end
 
     md5.hexdigest
   end
 

-private
+  private

 
 

-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  def spam_check
+    user.spam_check

   end
 end
   end
 end