X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..aa4205482a4af317ec26fc686793b57f02a6864a:/app/models/message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 98346d7c7..feceec5c0 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -7,9 +7,16 @@ class Message < ActiveRecord::Base
   validates_presence_of :title, :body, :sent_on, :sender, :recipient
   validates_length_of :title, :within => 1..255
   validates_inclusion_of :message_read, :in => [ true, false ]
-  validates_associated :sender, :recipient
   validates_as_utf8 :title
 
+  attr_accessible :title, :body
+
+  after_initialize :set_defaults
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
   def digest
     md5 = Digest::MD5.new
     md5 << from_user_id.to_s
@@ -19,4 +26,10 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
+
+private
+
+  def set_defaults
+    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  end
 end