X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b1e1572af3c209439e230d1822496a80c639bab5..4ab70b63c391c11f4eb9e914507662629c257c7e:/app/models/user_block.rb?ds=inline

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index ad564f418..47ff9ff08 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -28,9 +28,9 @@ 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 < ApplicationRecord
   # 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")) if revoker_id_changed? && !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