Show all diary comments to administrators

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 4f9cf11281896f6238e699160616510c91619b86..92cee16cd6e96bcc57e4718042c00a9cc7d57d59 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -3,12 +3,12 @@
 # Table name: user_blocks
 #
 #  id            :integer          not null, primary key
 # Table name: user_blocks
 #
 #  id            :integer          not null, primary key

-#  user_id       :integer          not null
-#  creator_id    :integer          not null
+#  user_id       :bigint(8)        not null
+#  creator_id    :bigint(8)        not null

 #  reason        :text             not null
 #  ends_at       :datetime         not null
 #  needs_view    :boolean          default(FALSE), not null
 #  reason        :text             not null
 #  ends_at       :datetime         not null
 #  needs_view    :boolean          default(FALSE), not null

-#  revoker_id    :integer
+#  revoker_id    :bigint(8)

 #  created_at    :datetime
 #  updated_at    :datetime
 #  reason_format :enum             default("markdown"), not null
 #  created_at    :datetime
 #  updated_at    :datetime
 #  reason_format :enum             default("markdown"), not null


@@ -26,12 +26,13 @@
 
 class UserBlock < ActiveRecord::Base
   validate :moderator_permissions
 
 class UserBlock < ActiveRecord::Base
   validate :moderator_permissions

+  validates :reason, :characters => true

 
   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 = USER_BLOCK_PERIODS
+  PERIODS = Settings.user_block_periods

 
   ##
   # scope to match active blocks
 
   ##
   # scope to match active blocks


@@ -63,7 +64,7 @@ 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(
+    update(

       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false
       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false