diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index fbb54e395..c0905e89c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -259,6 +259,7 @@ class ApplicationController < ActionController::Base # reacct静态资源加载不需要走这一步 return if params[:controller] == "main" # Find the current user + Rails.logger.info("current_laboratory is #{current_laboratory} domain is #{request.subdomain}") User.current = find_current_user uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous")) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index d7fbc56b6..e03273d68 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -11,7 +11,6 @@ module LaboratoryHelper def current_laboratory @_current_laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)) - # Rails.logger.info("current_laboratory is ######{@_current_laboratory.try(:identifier)}") end def default_laboratory