zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-01 08:43:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Registrar refactor fixes

Browse source
This commit is contained in:
Priit Tark 2015-04-10 10:58:51 +03:00
parent d09855bc6d
commit 9bb20365c9
15 changed files with 46 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/controllers/application_controller.rb
View file

@ -16,23 +16,32 @@ class ApplicationController < ActionController::Base
redirect_to registrar_root_path, alert: exception.message if current_user.is_a?(ApiUser)
end
helper_method :registrar_request?, :admin_request?
def registrar_request?
request.path.match(/^\/registrar/)
end
def admin_request?
request.path.match(/^\/admin/)
end
def after_sign_in_path_for(_resource)
rt = session[:user_return_to].to_s.presence
login_paths = [admin_login_path, registrar_login_path, '/login']
return rt if rt && !login_paths.include?(rt)
if request.path.match('registrar')
registrar_root_path
elsif request.path.match('admin')
admin_root_path
if registrar_request?
registrar_root_url
elsif admin_request?
admin_root_url
end
end
def after_sign_out_path_for(_resource)
if request.path.match('registrar')
registrar_login_path
elsif request.path.match('admin')
admin_login_path
if registrar_request?
registrar_login_url
elsif admin_request?
admin_login_url
end
end