Merge pull request #4218 from AntonKhorev/no-user-id-renames

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

diff --git a/app/models/user.rb b/app/models/user.rb
index b04f8e2b914c274babd1d9aec55c5f85ce4705e7..7ca7b7a3b5294a220a201034121987432f76ae92 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -100,6 +100,7 @@ class User < ApplicationRecord
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :characters => { :url_safe => true },
                            :whitespace => { :leading => false, :trailing => false }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
                            :characters => { :url_safe => true },
                            :whitespace => { :leading => false, :trailing => false }

+  validate :display_name_cannot_be_user_id_with_other_id, :if => proc { |u| u.display_name_changed? }

   validates :email, :presence => true, :confirmation => true, :characters => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }
   validates :email, :presence => true, :confirmation => true, :characters => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }


@@ -124,6 +125,12 @@ class User < ApplicationRecord
   before_save :update_tile
   after_save :spam_check
 
   before_save :update_tile
   after_save :spam_check
 

+  def display_name_cannot_be_user_id_with_other_id
+    display_name&.match(/^user_(\d+)$/i) do |m|
+      errors.add :display_name, I18n.t("activerecord.errors.messages.display_name_is_user_n") unless m[1].to_i == id
+    end
+  end
+

   def to_param
     display_name
   end
   def to_param
     display_name
   end