diff options
author | Azul <azul@leap.se> | 2013-10-10 09:52:16 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-10-10 09:52:16 +0200 |
commit | b676e6e6f5367d1be540af817062a77ee3fe7f00 (patch) | |
tree | 107c50e838d3fe2feb7da932869a9aabc62ce46b /users/app/models/login_format_validation.rb | |
parent | b60a75d8cbe25ac47bb037e9e54a7cf4e2ba4e1f (diff) | |
parent | eaedf19e2e54ccb9933caa8dc21df13e48609b18 (diff) |
Merge remote-tracking branch 'leap/develop'
Diffstat (limited to 'users/app/models/login_format_validation.rb')
-rw-r--r-- | users/app/models/login_format_validation.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/users/app/models/login_format_validation.rb b/users/app/models/login_format_validation.rb index 1d02bd1..c1fcf70 100644 --- a/users/app/models/login_format_validation.rb +++ b/users/app/models/login_format_validation.rb @@ -1,19 +1,21 @@ module LoginFormatValidation extend ActiveSupport::Concern + #TODO: Probably will replace this. Playing with using it for aliases too, but won't want it connected to login field. + included do # Have multiple regular expression validations so we can get specific error messages: validates :login, :format => { :with => /\A.{2,}\z/, - :message => "Login must have at least two characters"} + :message => "Must have at least two characters"} validates :login, :format => { :with => /\A[a-z\d_\.-]+\z/, :message => "Only lowercase letters, digits, . - and _ allowed."} validates :login, :format => { :with => /\A[a-z].*\z/, - :message => "Login must begin with a lowercase letter"} + :message => "Must begin with a lowercase letter"} validates :login, :format => { :with => /\A.*[a-z\d]\z/, - :message => "Login must end with a letter or digit"} + :message => "Must end with a letter or digit"} end end |