X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1340fca8f17e4e3cce211e6eafed18cde7f57386..3e180e745c0787aa1d2f1665a12d0378c8816aa7:/app/models/user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 7bf8f86b5..8821926bb 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -5,8 +5,16 @@ class UserBlock < ActiveRecord::Base
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
   
+  after_initialize :set_defaults
+
   PERIODS = USER_BLOCK_PERIODS
 
+  ##
+  # return a renderable version of the reason text.
+  def reason
+    RichText.new(read_attribute(:reason_format), read_attribute(:reason))
+  end
+
   ##
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
@@ -25,7 +33,14 @@ class UserBlock < ActiveRecord::Base
     }, :without_protection => true)
   end
 
-  private
+private
+
+  ##
+  # set default values for new records.
+  def set_defaults
+    self.reason_format = "markdown" unless self.attribute_present?(:reason_format)
+  end
+
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,