login redirects to referring page if exists

jrwest · Mar 2, 2010 · d1a71a1 · d1a71a1
1 parent e11ac10
commit d1a71a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/authr/sessions_controller.rb b/app/controllers/authr/sessions_controller.rb
@@ -7,7 +7,7 @@ def create
       if account = Account.authenticate(params[:account][:uname], params[:account][:password])
         session[:account_id] = account.id
         session[:account_login_time] = Time.now
-        redirect_to '/'
+        redirect_to (session[:return_to]) ? session[:return_to] : '/'
       else
         redirect_to new_session_path
       end

diff --git a/lib/extensions/action_controller/base.rb b/lib/extensions/action_controller/base.rb
@@ -12,6 +12,7 @@ def self.skip_authentication!(options = {})
 
     def authenticate_session
       unless valid_session? || [new_session_path, session_path].include?(request.request_uri)
+        session[:return_to] = request.request_uri
         redirect_to new_session_path 
       end
     end