Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

allow to login with email instead of nick as well + tests

Browse source
This commit is contained in:
wvengen 2013-09-20 22:39:19 +02:00
parent fa99a0a852
commit a77c3b59b1
5 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -25,9 +25,9 @@ class User < ActiveRecord::Base
# makes the current_user (logged-in-user) available in models
cattr_accessor :current_user
validates_presence_of :nick, :email
validates_presence_of :email
validates_presence_of :password, :on => :create
validates_length_of :nick, :in => 2..25
validates_length_of :nick, :in => 2..25, :allow_nil => true
validates_uniqueness_of :nick, :case_sensitive => false
validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
validates_uniqueness_of :email, :case_sensitive => false
@ -134,7 +134,7 @@ class User < ActiveRecord::Base
end
def self.authenticate(nick, password)
user = find_by_nick(nick)
user = (find_by_nick(nick) or find_by_email(nick))
if user && user.has_password(password)
user
else