kotovalexarian-likes-github
/
heartcombo--devise
mirror of https://github.com/heartcombo/devise.git
1
0
Fork 0
Code Releases Activity

Make validations based on authentication keys.

This commit is contained in:
José Valim 2009-11-15 03:32:22 -02:00
parent b70b293690
commit 6c46c0985e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/devise/models/validatable.rb
View File

@ -12,14 +12,18 @@ module Devise
def self.included(base)
base.class_eval do
attribute = authentication_keys.first
validates_presence_of :email
validates_uniqueness_of :email, :allow_blank => true
validates_format_of :email, :with => EMAIL_REGEX, :allow_blank => true
validates_presence_of attribute
validates_uniqueness_of attribute, :allow_blank => true
validates_format_of attribute, :with => EMAIL_REGEX, :allow_blank => true,
:scope => authentication_keys[1..-1]
validates_presence_of :password, :if => :password_required?
validates_confirmation_of :password, :if => :password_required?
validates_length_of :password, :within => 6..20, :allow_blank => true, :if => :password_required?
with_options :if => :password_required? do |v|
v.validates_presence_of :password
v.validates_confirmation_of :password
v.validates_length_of :password, :within => 6..20, :allow_blank => true
end
end
end