comparison app/models/user.rb @ 60:cf39b52d24b4 luisf

DEVELOPMENT COMMIT: The description can now be seen and edited BUT when a new user registers the informations is not saved to the correct table.
author luisf
date Wed, 01 Dec 2010 18:04:19 +0000
parents 7ff14a13f48a
children 9d42bcda8cea
comparison
equal deleted inserted replaced
59:7ff14a13f48a 60:cf39b52d24b4
62 attr_accessor :last_before_login_on 62 attr_accessor :last_before_login_on
63 # Prevents unauthorized assignments 63 # Prevents unauthorized assignments
64 attr_protected :login, :admin, :password, :password_confirmation, :hashed_password, :group_ids 64 attr_protected :login, :admin, :password, :password_confirmation, :hashed_password, :group_ids
65 65
66 validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) } 66 validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
67
68 # TODO: is this validation correct validates_presence_of :ssamr_user_detail
69
67 validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }, :case_sensitive => false 70 validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }, :case_sensitive => false
68 validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }, :case_sensitive => false 71 validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }, :case_sensitive => false
69 # Login must contain lettres, numbers, underscores only 72 # Login must contain lettres, numbers, underscores only
70 validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i 73 validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
71 validates_length_of :login, :maximum => 30 74 validates_length_of :login, :maximum => 30