X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c2f23fea6a7821a4ad4c97fd65744b138ec86267..1ff7e3ac71f0e31d6c4d26673d6357a76ef957aa:/app/models/user_block.rb diff --git a/app/models/user_block.rb b/app/models/user_block.rb index f56f87b9d..60f680ac3 100644 --- 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) # -class UserBlock < ActiveRecord::Base +class UserBlock < ApplicationRecord 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 - PERIODS = USER_BLOCK_PERIODS + PERIODS = Settings.user_block_periods ## # scope to match active blocks