Pass parameters to APIAlreadyDeletedError correctly

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 7bf8f86b5095dbf4d12697a826d3d6d3a3639203..2cf0eefc419fd3770c2c339819ac1beb56d1f169 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -5,8 +5,22 @@ class UserBlock < ActiveRecord::Base
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
   
   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
 
   PERIODS = USER_BLOCK_PERIODS
 

+  ##
+  # scope to match active blocks
+  def self.active
+    self.where("needs_view or ends_at > ?", Time.now.getutc)
+  end
+
+  ##
+  # 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).
   ##
   # returns true if the block is currently active (i.e: the user can't
   # use the API).


@@ -25,7 +39,14 @@ class UserBlock < ActiveRecord::Base
     }, :without_protection => true)
   end
 
     }, :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,
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,