Don't validate the revoker for a block if it hasn't changed

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 60f680ac3016e02b2d4b6acf4437658b26f01f5d..ad564f4189d9c9b0be5e73d4146bbcfd03c1ff79 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -79,6 +79,6 @@ class UserBlock < ApplicationRecord
   # 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_block.model.non_moderator_revoke")) if revoker_id_changed? && !revoker_id.nil? && !revoker.moderator?
   end
 end