diff options
| author | Azul <azul@leap.se> | 2012-11-22 13:05:32 +0100 | 
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-22 13:05:32 +0100 | 
| commit | 6d5f8d0f993093b51d1f11bb528c535dcf88a969 (patch) | |
| tree | 6664d69537dae7c1a9a60972a1ce2e3dc9e43031 /users/app/controllers | |
| parent | cec9ad7c514f2f3c767bd12bfc3df28db4d1a98b (diff) | |
beautify login workflow
* translating error messages
* not caching login and password in js anymore
* catching non responses
Diffstat (limited to 'users/app/controllers')
| -rw-r--r-- | users/app/controllers/controller_extension/authentication.rb | 8 | ||||
| -rw-r--r-- | users/app/controllers/sessions_controller.rb | 3 | 
2 files changed, 8 insertions, 3 deletions
| diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb index 87f7921..6ac7a5b 100644 --- a/users/app/controllers/controller_extension/authentication.rb +++ b/users/app/controllers/controller_extension/authentication.rb @@ -7,8 +7,12 @@ module ControllerExtension::Authentication      helper_method :current_user, :logged_in?, :admin?    end -  def authentication_error -    warden.winning_strategy.try(:message) +  def authentication_errors +    return unless errors = warden.winning_strategy.try(:message) +    errors.inject({}) do |translated,err| +      translated[err.first] = I18n.t(err.last) +      translated +    end    end    def logged_in? diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index 32d1ddc..bc910b5 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -4,7 +4,8 @@ class SessionsController < ApplicationController    def new      @session = Session.new -    if @errors = authentication_error +    if authentication_errors +      @errors = authentication_errors        render :status => 422      end    end | 
