htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

current_user nil not false

Browse Source
This commit is contained in:
Jan Renz
2015-04-28 16:12:43 +02:00
parent 2480c51c2b
commit 23ddfaca11
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -10,8 +10,11 @@ class ApplicationController < ActionController::Base
rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized
def current_user def current_user
::NewRelic::Agent.add_custom_parameters({ external_user_id: :external_user_id, user_id: :user_id, session_user_id: session[:user_id] }) ::NewRelic::Agent.add_custom_parameters({ external_user_id: :session[:external_user_id], session_user_id: session[:user_id] })
@current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources
if @current_user == false
@current_user = nil
end
end end
def help def help