kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Make validations based on authentication keys.

Browse source
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) def self.included(base)
base.class_eval do base.class_eval do
attribute = authentication_keys.first
validates_presence_of :email validates_presence_of attribute
validates_uniqueness_of :email, :allow_blank => true validates_uniqueness_of attribute, :allow_blank => true
validates_format_of :email, :with => EMAIL_REGEX, :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? with_options :if => :password_required? do |v|
validates_confirmation_of :password, :if => :password_required? v.validates_presence_of :password
validates_length_of :password, :within => 6..20, :allow_blank => true, :if => :password_required? v.validates_confirmation_of :password
v.validates_length_of :password, :within => 6..20, :allow_blank => true
end
end end
end end