lib/generators/jt/user/templates/controllers/concerns/current_user.rb in jt-rails-generator-user-1.0.7 vs lib/generators/jt/user/templates/controllers/concerns/current_user.rb in jt-rails-generator-user-1.1.0
- old
+ new
@@ -13,12 +13,17 @@
def current_user
@current_user ||= User.find_by_id(session[:user_id]) if session[:user_id]
@current_user
end
+ def store_location
+ session[:return_to] = request.fullpath if request.get? && !request.xhr?
+ end
+
def require_user
if !current_user
+ store_location
redirect_to login_url
return false
end
true
end
@@ -27,8 +32,13 @@
if current_user
redirect_to root_url
return false
end
true
+ end
+
+ def redirect_back_or_default(default_url)
+ redirect_to session[:return_to] || default_url
+ session[:return_to] = nil
end
end
\ No newline at end of file