@@ -16,7 +16,7 @@ # before_filter :login_required, :except => [:index, :show] module Authentication def self.included(controller) - controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in? + controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :redirect_to_target_or_default controller.filter_parameter_logging :password end @@ -31,7 +31,19 @@ module Authentication def login_required unless logged_in? flash[:error] = "You must first log in or sign up before accessing this page." + store_target_location redirect_to login_url end end + + def redirect_to_target_or_default(default) + redirect_to(session[:return_to] || default) + session[:return_to] = nil + end + + private + + def store_target_location + session[:return_to] = request.request_uri + end end rails_generators/nifty_authentication/templates/authentication.rb @@ -7,7 +7,7 @@ class <%= sessions_class_name %>Controller < ApplicationController if <%= user_singular_name %> session[:<%= user_singular_name %>_id] = <%= user_singular_name %>.id flash[:notice] = "Logged in successfully." - redirect_to root_url + redirect_to_target_or_default(root_url) else flash.now[:error] = "Invalid login or password." render :action => 'new' rails_generators/nifty_authentication/templates/sessions_controller.rb eae76670695f8dc1077933690da2b97ad6325b27 James Miller james@jkmillertech.com http://github.com/ryanb/nifty-generators/commit/c82a961915907dce51d985ebd3d0a493c72fbd82 c82a961915907dce51d985ebd3d0a493c72fbd82 2009-05-14T12:35:13-07:00 2009-05-13T16:20:57-07:00 Store request target location when login is required Signed-off-by: Ryan Bates <ryan@railscasts.com> 53b3430cfc980da319891c4c5f782c71deab5231 Ryan Bates ryan@railscasts.com