X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4377e2bd55bd6bed320b7c3595087d4317b1c9bc..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/user_block.rb?ds=inline diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 92cee16cd..47ff9ff08 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -24,13 +24,13 @@ # user_blocks_user_id_fkey (user_id => users.id) # -class UserBlock < ActiveRecord::Base +class UserBlock < ApplicationRecord 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" + belongs_to :creator, :class_name => "User" + belongs_to :revoker, :class_name => "User" PERIODS = Settings.user_block_periods @@ -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 - 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