From 243b29240a8477b1962aaf4f7b1a0b15007260f0 Mon Sep 17 00:00:00 2001 From: joshua stein Date: Fri, 8 Aug 2014 10:16:06 -0500 Subject: [PATCH] when redirecting to /login, save the url and params to redirect back to closes #164 --- app/controllers/application_controller.rb | 4 ++++ app/controllers/login_controller.rb | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e954f0c..de8f279 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -55,6 +55,10 @@ class ApplicationController < ActionController::Base if @user true else + if request.get? + session[:redirect_to] = request.original_fullpath + end + redirect_to "/login" end end diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb index ecdf166..536c447 100644 --- a/app/controllers/login_controller.rb +++ b/app/controllers/login_controller.rb @@ -24,7 +24,13 @@ class LoginController < ApplicationController if user && user.is_active? && user.try(:authenticate, params[:password].to_s) session[:u] = user.session_token - return redirect_to "/" + + if (rd = session[:redirect_to]).present? + session.delete(:redirect_to) + return redirect_to rd + else + return redirect_to "/" + end end flash.now[:error] = "Invalid e-mail address and/or password."