deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

login with both email or username

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-25 16:10:14 +02:00
parent 1496c01521
commit 9d92433a7c
4 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/models/user.rb
View file

@ -46,6 +46,13 @@ class User < ActiveRecord::Base
attr_accessor :force_random_password
# Virtual attribute for authenticating by either username or email
attr_accessor :login
# Add login to attr_accessible
attr_accessible :login
#
# Relations
#
@ -140,6 +147,16 @@ class User < ActiveRecord::Base
# Class methods
#
class << self
# Devise method overriden to allow sing in with email or username
def find_for_database_authentication(warden_conditions)
conditions = warden_conditions.dup
if login = conditions.delete(:login)
where(conditions).where(["lower(username) = :value OR lower(email) = :value", { value: login.downcase }]).first
else
where(conditions).first
end
end
def filter filter_name
case filter_name
when "admins"; self.admins

16
app/views/devise/sessions/new.html.haml
View file

@ -1,19 +1,19 @@
- if ldap_enable?
= render :partial => 'devise/sessions/new_ldap'
= render partial: 'devise/sessions/new_ldap'
- else
= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f|
= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo"
= f.email_field :email, :class => "text top", :placeholder => "Email", :autofocus => "autofocus"
= f.password_field :password, :class => "text bottom", :placeholder => "Password"
= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "login-box" }) do |f|
= image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
= f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
= f.password_field :password, class: "text bottom", placeholder: "Password"
- if devise_mapping.rememberable?
.clearfix.inputs-list
%label.checkbox.remember_me{:for => "user_remember_me"}
%label.checkbox.remember_me{for: "user_remember_me"}
= f.check_box :remember_me
%span Remember me
%br/
= f.submit "Sign in", :class => "btn-create btn"
= f.submit "Sign in", class: "btn-create btn"
.pull-right
= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
= link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
%br/
- if Gitlab.config.gitlab.signup_enabled
%hr/