refactors sessions_controller
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
class Users::SessionsController < Devise::SessionsController
|
class Users::SessionsController < Devise::SessionsController
|
||||||
|
|
||||||
def after_sign_in_path_for(resource)
|
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
|
welcome_path
|
||||||
else
|
else
|
||||||
super
|
super
|
||||||
@@ -10,9 +10,9 @@ class Users::SessionsController < Devise::SessionsController
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def stored_path_allows_welcome_screen?
|
def verifying_via_email?
|
||||||
stored_path = session[stored_location_key_for(resource)]
|
stored_path = session[stored_location_key_for(resource)] || ""
|
||||||
stored_path.nil? || stored_path[0..5] != "/email"
|
stored_path[0..5] == "/email"
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user