diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:38:47 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:38:47 -0500 |
| commit | 110d67f433c091a3b739c5bbebe110d963efaa73 (patch) | |
| tree | cf6d32d1a14e9e384d6debca21ecedad9d3dbed8 /app/controllers/sessions_controller.rb | |
| parent | 2c1f214da8885232815cb85ded4ad616aa3d4b79 (diff) | |
no
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index f857f27..4bd69a5 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -11,13 +11,8 @@ class SessionsController < ApplicationController # POST /sessions.json def create # find the user... - - @user = User.find_by(email: params[:session][:email]) - - if @user.nil? - @user = User.find_by_user_name(params[:session][:user_name]) - end - + #find by email + @user = User.find_by_email(params[:session][:username_or_email]) || User.find_by_user_name(params[:session][:username_or_email]) #@session = Session.new(@user) # ... and create a new session respond_to do |format| |