X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21bf5d79d680f7dc0447b1b5980ad5ce0a4b830c..50b2f4f656b82112fce4939da26a1afc6b140e89:/app/models/user_block.rb?ds=sidebyside

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 92cee16cd..9150bae79 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -24,7 +24,7 @@
 #  user_blocks_user_id_fkey       (user_id => users.id)
 #
 
-class UserBlock < ActiveRecord::Base
+class UserBlock < ApplicationRecord
   validate :moderator_permissions
   validates :reason, :characters => true
 
@@ -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