Merge branch 'rails42'

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 23e1bcab6c26de4afd1e85019102ae64adc58b41..d8fa95cb2319f2aeb7d31a9995641ca1a8496231 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -4,8 +4,20 @@ class UserBlock < ActiveRecord::Base
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id

-  
-  PERIODS = APP_CONFIG['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
 
   ##
   # returns true if the block is currently active (i.e: the user can't


@@ -18,18 +30,21 @@ class UserBlock < ActiveRecord::Base
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)

-    update_attributes({ :ends_at => Time.now.getutc(),
-                        :revoker_id => revoker.id,
-                        :needs_view => false })
+    update_attributes(
+      :ends_at => Time.now.getutc(),
+      :revoker_id => revoker.id,
+      :needs_view => false
+    )

   end
 
   end
 

-  private
+private
+

   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions

-    errors.add_to_base(I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? and !creator.moderator?
-    errors.add_to_base(I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? or revoker.moderator?
+    errors.add(:base, I18n.t('user_block.model.non_moderator_update')) if creator_id_changed? and !creator.moderator?
+    errors.add(:base, I18n.t('user_block.model.non_moderator_revoke')) unless revoker_id.nil? or revoker.moderator?

   end
 end
   end
 end