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

app/controllers/application_controller.rb

@@ -299,7 +299,7 @@ class ApplicationController < ActionController::Base
 	# and starts a session if needed
 	def find_current_user
 		uid_logger("user setup start: session[:user_id] is #{session[:user_id]}")
-		uid_logger("0000000000000user setup start: session[:user_id] is #{session[:"#{default_yun_session}"]}")
+		uid_logger("0000000000000user setup start: default_yun_session is #{default_yun_session}, session[:current_user_id] is #{session[:"#{default_yun_session}"]}")
 		current_domain_session = session[:"#{default_yun_session}"]
 		if current_domain_session
 			# existing session

app/controllers/concerns/laboratory_helper.rb

@@ -6,7 +6,6 @@ module LaboratoryHelper
 
     helper_method :current_laboratory
     helper_method :default_setting
-    helper_method :default_yun_session
   end
 
   def current_laboratory
@@ -26,7 +25,7 @@ module LaboratoryHelper
   end
 
   def default_yun_session
-    @_default_yun_session = "#{request.subdomain.split('.').first}_user_id"
-    # @_default_yun_session = "#{current_laboratory.try(:identifier).split('.').first}_user_id"
+    laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
+    @_default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id"
   end
 end