From e7621afba5a2ae3f524e0aed3f92939f24c5b925 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Thu, 19 Nov 2009 14:00:15 -0200 Subject: [PATCH] Updating changelog and adding example doc. --- CHANGELOG.rdoc | 6 +++++- lib/devise/models/authenticatable.rb | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 3a58bd84..f675e746 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,7 @@ +* enhancements + + * Allow overwriting find for authentication method + == 0.5.4 * deprecations @@ -59,7 +63,7 @@ * skip_before_filter added in Devise controllers * Use home_or_root_path on require_no_authentication as well * Added devise_controller?, useful to select or reject filters in ApplicationController - * Allow :path_prefix to be given to devise_for + * Allow :path_prefix to be given to devise_for * Allow default_url_options to be configured through devise (:path_prefix => "/:locale" is now supported) == 0.4.1 diff --git a/lib/devise/models/authenticatable.rb b/lib/devise/models/authenticatable.rb index 7ac60fb2..82281bbd 100644 --- a/lib/devise/models/authenticatable.rb +++ b/lib/devise/models/authenticatable.rb @@ -73,6 +73,13 @@ module Devise # Find first record based on conditions given (ie by the sign in form). # Overwrite to add customized conditions, create a join, or maybe use a # namedscope to filter records while authenticating. + # Example: + # + # def self.find_for_authentication(conditions={}) + # conditions[:active] = true + # find(:first, :conditions => conditions) + # end + # def find_for_authentication(conditions) find(:first, :conditions => conditions) end