Fixed return_to when authorization gets lost.

This commit is contained in:
benni 2012-12-30 16:34:01 +01:00
parent f6ff422405
commit 0364562273
2 changed files with 9 additions and 3 deletions

View file

@ -22,7 +22,7 @@ class ApplicationController < ActionController::Base
helper_method :current_user
def deny_access
self.return_to = request.original_url
session[:return_to] = request.original_url
redirect_to login_url, :alert => 'Access denied!'
end
@ -33,7 +33,7 @@ class ApplicationController < ActionController::Base
if !current_user
# No user at all: redirect to login page.
session[:user_id] = nil
session['return_to'] = request.fullpath
session[:return_to] = request.original_url
redirect_to login_url, :alert => 'Authentication required!'
else
# We have an authenticated user, now check role...