Merge branch 'dev_local' into dev_local_scyd

6 years ago · ad5eee32a1
parent 161aba77bd 19cdfc1a12
commit ad5eee32a1
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/cooperative/base_controller.rb
+++ b/app/controllers/cooperative/base_controller.rb
@ -16,7 +16,7 @@ class Cooperative::BaseController < ApplicationController
  private

  def current_laboratory
-    @_current_laboratory ||= Laboratory.find_by_subdomain(request.subdomain)
+    @_current_laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.first)
  end

  def current_setting_or_default(name)