Fixed issue #602 - Admin user login via Oauth.
This commit is contained in:
parent
8078d1b39f
commit
d36570aef0
|
@ -176,6 +176,7 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
def user_device_log(user, type)
|
def user_device_log(user, type)
|
||||||
switched_from_user_id = ENV['SWITCHED_FROM_USER_ID'] || session[:switched_from_user_id]
|
switched_from_user_id = ENV['SWITCHED_FROM_USER_ID'] || session[:switched_from_user_id]
|
||||||
|
return true if params[:controller] == 'init' # do no device logging on static inital page
|
||||||
return true if switched_from_user_id
|
return true if switched_from_user_id
|
||||||
return true if !user
|
return true if !user
|
||||||
return true if !user.permissions?('user_preferences.device')
|
return true if !user.permissions?('user_preferences.device')
|
||||||
|
|
Loading…
Reference in a new issue