From d94d50a1743f43e30f77a20070f1051237286e72 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Mon, 23 Mar 2015 16:50:53 +0200 Subject: [PATCH] Strip return to path --- app/controllers/application_controller.rb | 14 ++++---------- app/controllers/registrar/sessions_controller.rb | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dc59e6ad3..5cc352e2e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -16,18 +16,12 @@ class ApplicationController < ActionController::Base end def after_sign_in_path_for(_resource) - if session[:user_return_to] - return session[:user_return_to].to_s - end - - if request.path.match('registrar') - registrar_invoices_path - elsif request.path.match('admin') - admin_dashboard_path - end + rt = session[:user_return_to].to_s.presence + return session[:user_return_to].to_s if rt && rt != admin_login_path + admin_dashboard_path end - def after_sign_out_path_for(_resource) + def after_sign_out_path_for(_resource) if request.path.match('registrar') registrar_login_path elsif request.path.match('admin') diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index 81a97ea08..d52a37608 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -11,7 +11,6 @@ class Registrar::SessionsController < SessionsController end def login - end def login_mid