Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

dev_tpm_ui
杨树明 5 years ago
commit f724a679ae

@ -11,7 +11,7 @@ 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)}, domain is #{request.subdomain}")
Rails.logger.info("current_laboratory domain is #{request.subdomain}")
end
def default_laboratory

Loading…
Cancel
Save