@@ -92,7 +92,7 class User < Principal | |||||
92 | validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) } |
|
92 | validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) } | |
93 | validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false |
|
93 | validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false | |
94 | validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false |
|
94 | validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false | |
95 |
# Login must contain lett |
|
95 | # Login must contain letters, numbers, underscores only | |
96 | validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i |
|
96 | validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i | |
97 | validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT |
|
97 | validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT | |
98 | validates_length_of :firstname, :lastname, :maximum => 30 |
|
98 | validates_length_of :firstname, :lastname, :maximum => 30 | |
@@ -145,7 +145,7 class User < Principal | |||||
145 | begin |
|
145 | begin | |
146 | write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url)) |
|
146 | write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url)) | |
147 | rescue OpenIdAuthentication::InvalidOpenId |
|
147 | rescue OpenIdAuthentication::InvalidOpenId | |
148 |
# Inv |
|
148 | # Invalid url, don't save | |
149 | end |
|
149 | end | |
150 | end |
|
150 | end | |
151 | self.read_attribute(:identity_url) |
|
151 | self.read_attribute(:identity_url) |
General Comments 0
You need to be logged in to leave comments.
Login now