|
|
|
@ -285,7 +285,7 @@ class ApplicationController < ActionController::Base
|
|
|
|
|
|
|
|
|
|
|
|
def user_setup
|
|
|
|
def user_setup
|
|
|
|
# # reacct静态资源加载不需要走这一步
|
|
|
|
# # reacct静态资源加载不需要走这一步
|
|
|
|
return if params[:controller] == "main"
|
|
|
|
#return if params[:controller] == "main"
|
|
|
|
# Find the current user
|
|
|
|
# Find the current user
|
|
|
|
#Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}")
|
|
|
|
#Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}")
|
|
|
|
User.current = find_current_user
|
|
|
|
User.current = find_current_user
|
|
|
|
|
