consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactors sessions_controller

Browse Source
This commit is contained in:
kikito
2015-10-09 13:30:19 +02:00
parent 31bc9e089b
commit 6da7854152
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/users/sessions_controller.rb
View File

@@ -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