diff options
| author | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-22 16:22:49 +0100 |
| commit | fb791b200ee4da1b6a2f4e3121cb26196e28c953 (patch) | |
| tree | d71fa9065faec5f1bb584e18e45583b393bcd429 /users/app/controllers/sessions_controller.rb | |
| parent | 13f53593551549d8e95e382fd42a92efc170943d (diff) | |
| parent | ec87ccfa185a4c063386d385de7af15f993b77d8 (diff) | |
Merge branch 'feature/error-messages-on-login' into develop
Diffstat (limited to 'users/app/controllers/sessions_controller.rb')
| -rw-r--r-- | users/app/controllers/sessions_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index 486f67e..bc910b5 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -3,7 +3,11 @@ class SessionsController < ApplicationController skip_before_filter :verify_authenticity_token def new - @errors = authentication_error + @session = Session.new + if authentication_errors + @errors = authentication_errors + render :status => 422 + end end def create |