IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

check_username api now returns correct error message for invalid lengths etc

Browse Source
This commit is contained in:
Neil Lalonde
2013-02-08 14:12:48 -05:00
parent 84191802df
commit ce7088f081
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -376,7 +376,7 @@ class User < ActiveRecord::Base
def username_format_validator
validator = UsernameValidator.new(username)
unless validator.valid_format?
errors.add(:username, validator.error)
validator.errors.each { |e| errors.add(:username, e) }
end
end

26
app/models/username_validator.rb
View File

@@ -2,9 +2,9 @@ class UsernameValidator
def initialize(username)
@username = username
@error = []
@errors = []
end
attr_accessor :error
attr_accessor :errors
attr_reader :username
def user
@@ -17,43 +17,43 @@ class UsernameValidator
username_length_max?
username_char_valid?
username_first_char_valid?
error.blank?
errors.empty?
end
private
def username_exist?
return unless error.empty?
return unless errors.empty?
unless username
self.error = I18n.t(:'user.username.blank')
self.errors << I18n.t(:'user.username.blank')
end
end
def username_length_min?
return unless error.empty?
return unless errors.empty?
if username.length < User.username_length.begin
self.error = I18n.t(:'user.username.short', min: User.username_length.begin)
self.errors << I18n.t(:'user.username.short', min: User.username_length.begin)
end
end
def username_length_max?
return unless error.empty?
return unless errors.empty?
if username.length > User.username_length.end
self.error = I18n.t(:'user.username.long', max: User.username_length.end)
self.errors << I18n.t(:'user.username.long', max: User.username_length.end)
end
end
def username_char_valid?
return unless error.empty?
return unless errors.empty?
if username =~ /[^A-Za-z0-9_]/
self.error = I18n.t(:'user.username.characters')
self.errors << I18n.t(:'user.username.characters')
end
end
def username_first_char_valid?
return unless error.empty?
return unless errors.empty?
if username[0,1] =~ /[^A-Za-z0-9]/
self.error = I18n.t(:'user.username.must_begin_with_alphanumeric')
self.errors << I18n.t(:'user.username.must_begin_with_alphanumeric')
end
end