Fix registration link

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index f56f87b9de255408ed72fb0d0a7044103c9591d0..47ff9ff08abcb4359476f830da79fa714b2d344c 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -24,15 +24,15 @@
 #  user_blocks_user_id_fkey       (user_id => users.id)
 #
 
 #  user_blocks_user_id_fkey       (user_id => users.id)
 #
 

-class UserBlock < ActiveRecord::Base
+class UserBlock < ApplicationRecord

   validate :moderator_permissions
   validate :moderator_permissions

-  validates :reason, :invalid_chars => true
+  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"
+  belongs_to :creator, :class_name => "User"
+  belongs_to :revoker, :class_name => "User"

 
 

-  PERIODS = USER_BLOCK_PERIODS
+  PERIODS = Settings.user_block_periods

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


@@ -78,7 +78,7 @@ class UserBlock < ActiveRecord::Base
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
   # 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(:base, I18n.t("user_block.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
-    errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) unless revoker_id.nil? || revoker.moderator?
+    errors.add(:base, I18n.t("user_blocks.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
+    errors.add(:base, I18n.t("user_blocks.model.non_moderator_revoke")) if revoker_id_changed? && !revoker_id.nil? && !revoker.moderator?

   end
 end
   end
 end