autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct validators so that existing error messages would look correct (#3668)

Browse Source
This commit is contained in:
Eugen Rochko
2017-06-09 19:46:01 +02:00
committed by GitHub
parent 1a065fb146
commit cdff1da901
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/account.rb
View File

@ -57,7 +57,8 @@ class Account < ApplicationRecord
validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && username_changed? }
# Local user validations
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, unreserved: true, if: -> { local? && username_changed? }
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: -> { local? && username_changed? }
validates_with UnreservedUsernameValidator, if: -> { local? && username_changed? }
validates :display_name, length: { maximum: 30 }, if: -> { local? && display_name_changed? }
validates :note, length: { maximum: 160 }, if: -> { local? && note_changed? }

2
app/models/user.rb
View File

@ -47,7 +47,7 @@ class User < ApplicationRecord
accepts_nested_attributes_for :account
validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
validates :email, email: true, if: :email_changed?
validates_with BlacklistedEmailValidator, if: :email_changed?
scope :recent, -> { order(id: :desc) }
scope :admins, -> { where(admin: true) }