gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #153 from ChrisBr/redirect_admin

Browse source 
Redirects to admin/index after admin login
This commit is contained in:
Christian Bruckmayer 2014-05-26 11:40:54 +02:00
commit 989848ce88
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/application_controller.rb
View file

@ -9,6 +9,12 @@ class ApplicationController < ActionController::Base
end end
def after_sign_in_path_for(resource) def after_sign_in_path_for(resource)
if organizer_or_admin? &&
(!session[:return_to] ||
session[:return_to] &&
session[:return_to] == root_path)
admin_conference_index_path
else
if session[:return_to] && if session[:return_to] &&
!session[:return_to].start_with?(user_registration_path) !session[:return_to].start_with?(user_registration_path)
logger.debug "Returning to #{session[:return_to]}" logger.debug "Returning to #{session[:return_to]}"
@ -18,6 +24,7 @@ class ApplicationController < ActionController::Base
super super
end end
end end
end
def get_conferences def get_conferences
@conferences =Conference.all @conferences =Conference.all