From 110d67f433c091a3b739c5bbebe110d963efaa73 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 6 Mar 2014 17:38:47 -0500 Subject: no --- app/controllers/sessions_controller.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/controllers/sessions_controller.rb') 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| -- cgit v1.2.3-54-g00ecf