From 6da78541528c0fc428c05e2ecbf51a04404a4125 Mon Sep 17 00:00:00 2001 From: kikito Date: Fri, 9 Oct 2015 13:30:19 +0200 Subject: [PATCH] refactors sessions_controller --- app/controllers/users/sessions_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index bbab5371a..fe914404f 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -1,7 +1,7 @@ class Users::SessionsController < Devise::SessionsController def after_sign_in_path_for(resource) - if stored_path_allows_welcome_screen? && resource.show_welcome_screen? + if !verifying_via_email? && resource.show_welcome_screen? welcome_path else super @@ -10,9 +10,9 @@ class Users::SessionsController < Devise::SessionsController private - def stored_path_allows_welcome_screen? - stored_path = session[stored_location_key_for(resource)] - stored_path.nil? || stored_path[0..5] != "/email" + def verifying_via_email? + stored_path = session[stored_location_key_for(resource)] || "" + stored_path[0..5] == "/email" end end