|
|
|
@ -315,8 +315,8 @@ class User < Principal
|
|
|
|
|
validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
|
|
|
|
|
validates_length_of :firstname, :maximum => 30
|
|
|
|
|
validates_length_of :lastname, :maximum => 30
|
|
|
|
|
validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
|
|
|
|
|
validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
|
|
|
|
|
#validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
|
|
|
|
|
#validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
|
|
|
|
|
validates_confirmation_of :password, :allow_nil => true
|
|
|
|
|
# validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
|
|
|
|
|
validate :validate_password_length
|
|
|
|
|