diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-06 15:57:26 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-06 15:57:26 -0500 |
| commit | a421aace7383bb6718d23eed1bde02659a7a93ff (patch) | |
| tree | 1068eb34bd437d70faa44d123bbb6be6e1bcf6de /app/controllers/sessions_controller.rb | |
| parent | 2c1f214da8885232815cb85ded4ad616aa3d4b79 (diff) | |
login fixed and some views look better
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index f857f27..d5c59d4 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -12,11 +12,7 @@ class SessionsController < ApplicationController 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 + @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 |