allow regex options on username site settings

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

View File

@ -1,8 +1,10 @@
class StringSettingValidator
include RegexSettingValidation
def initialize(opts = {})
@opts = opts
@regex = Regexp.new(opts[:regex]) if opts[:regex]
@regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
initialize_regex_opts(opts)
end
def valid_value?(val)
@ -13,12 +15,7 @@ class StringSettingValidator
return false
end
if @regex && !(val =~ @regex)
@regex_fail = true
return false
end
true
regex_match?(val)
end
def error_message