diff options
| -rw-r--r-- | app/controllers/sessions_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/sessions/new.html.erb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index d5c59d4..7cb16e8 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -11,7 +11,6 @@ class SessionsController < ApplicationController # POST /sessions.json def create # find the user... - @user = User.find_by_email(params[:session][:username_or_email]) || User.find_by_user_name(params[:session][:username_or_email]) #@session = Session.new(@user) diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 398cb49..b4acf77 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,12 +1,12 @@ <h1>Sign in</h1> <% if @user.nil? %> - <p class="errors"> The email or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current email and password. </p> + <p class="errors"> The email/username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current email/username and password. </p> <% end %> <div class="span6 offset3"> <%= form_for(:session, url: sessions_path) do |f| %> <p> - <%= f.label(:username_or_email, "Username/Email") %><br/> + <%= f.label(:username_or_email, "Username/Email") %><br/> <%= f.text_field :username_or_email%> </p> <p> |