1
0
mirror of https://github.com/mastodon/mastodon synced 2024-11-28 06:48:28 +09:00

Redirect after sign in to previous page (unless it's a sign in/up/etc page)

This commit is contained in:
Eugen Rochko 2016-10-02 17:11:08 +02:00
parent 6d7290f47c
commit a0f85774c4
2 changed files with 9 additions and 1 deletions

View File

@ -10,10 +10,18 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::RoutingError, with: :not_found rescue_from ActionController::RoutingError, with: :not_found
rescue_from ActiveRecord::RecordNotFound, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found
before_filter :store_current_location, :unless => :devise_controller?
def raise_not_found def raise_not_found
raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}" raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}"
end end
private
def store_current_location
store_location_for(:user, request.url)
end
protected protected
def not_found def not_found

View File

@ -12,6 +12,6 @@ class Auth::SessionsController < Devise::SessionsController
protected protected
def after_sign_in_path_for(_resource) def after_sign_in_path_for(_resource)
root_path stored_location_for(:user) || root_path
end end
end end