Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

allow regex options on username site settings

Browse source
This commit is contained in:
Neil Lalonde 2017-10-04 15:08:51 -04:00
parent c29334cf23
commit ddbd1d5ab8
4 changed files with 53 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/validators/username_setting_validator.rb
View file

@ -1,13 +1,21 @@
class UsernameSettingValidator
include RegexSettingValidation
def initialize(opts = {})
@opts = opts
initialize_regex_opts(opts)
end
def valid_value?(val)
!val.present? || User.where(username: val).exists?
!val.present? || (User.where(username: val).exists? && regex_match?(val))
end
def error_message
I18n.t('site_settings.errors.invalid_username')
if @regex_fail
I18n.t(@regex_error)
else
I18n.t('site_settings.errors.invalid_username')
end
end
end