github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Improve error messages for invites (#12714)

Browse Source 
The error messages used to include an unnecessary 'Validation failed:
Email' prefix which was removed.
This commit is contained in:
Dan Ungureanu
2021-04-15 14:46:32 +03:00
committed by GitHub
parent c60668a052
commit 85d4b60a45
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/validators/email_validator.rb
View File

@ -4,14 +4,20 @@ class EmailValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
unless value =~ EmailValidator.email_regex
record.errors.add(attribute, I18n.t(:'user.email.invalid'))
if Invite === record && attribute == :email
record.errors.add(:base, I18n.t(:'invite.invalid_email', email: value))
else
record.errors.add(attribute, I18n.t(:'user.email.invalid'))
end
invalid = true
end
unless EmailValidator.allowed?(value)
record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
invalid = true
end
if record.errors[attribute].blank? && value && ScreenedEmail.should_block?(value)
if !invalid && ScreenedEmail.should_block?(value)
record.errors.add(attribute, I18n.t(:'user.email.blocked'))
end
end