From ef4fd30cd9dfff9a349aa1ee3124d1ef90bb93ee Mon Sep 17 00:00:00 2001 From: Georg G Date: Wed, 22 Apr 2015 00:33:55 +0200 Subject: [PATCH] closes Retrospring/bugs#17 --- app/models/user.rb | 2 +- app/views/devise/passwords/new.html.haml | 2 +- config/initializers/devise.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 01a1e6e2..c92dabe4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -68,7 +68,7 @@ class User < ActiveRecord::Base end def self.find_first_by_auth_conditions(warden_conditions) - conditions = warden_conditions.dup.to_h + conditions = warden_conditions.dup if login = conditions.delete(:login) where(conditions).where(["lower(screen_name) = :value OR lower(email) = :value", { :value => login.downcase }]).first else diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index aa400f65..59aabb17 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -3,7 +3,7 @@ = bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| = devise_error_messages! - = f.text_field :screen_name, autofocus: true, label: "User name" + = f.text_field :login, autofocus: true, label: "User name" = f.submit "Send me password reset instructions" = render "devise/shared/links" diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3aa9864d..fc6c699c 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -181,7 +181,7 @@ Devise.setup do |config| # ==> Configuration for :recoverable # # Defines which key will be used when recovering the password for an account - config.reset_password_keys = [ :screen_name ] + config.reset_password_keys = [ :login ] # Time interval you can reset your password with a reset password key. # Don't put a too small interval or your users won't have the time to