Store the current exhibit in a thread-local variable for selecting i1…

…8n translations; fixes #2014
projectblacklight · Apr 20, 2018 · 5c75ff8 · 5c75ff8
1 parent 6e0d93f
commit 5c75ff8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/controllers/concerns/spotlight/controller.rb b/app/controllers/concerns/spotlight/controller.rb
@@ -12,7 +12,7 @@ module Controller
     end
 
     def set_exhibit_locale_scope
-      Translation.exhibit_default_scope(current_exhibit)
+      Translation.current_exhibit = current_exhibit
     end
 
     def current_site

diff --git a/app/models/concerns/spotlight/custom_translation_extension.rb b/app/models/concerns/spotlight/custom_translation_extension.rb
@@ -6,12 +6,17 @@ module CustomTranslationExtension
     extend ActiveSupport::Concern
 
     included do
+      default_scope { where(exhibit: current_exhibit) }
       belongs_to :exhibit, class_name: 'Spotlight::Exhibit', inverse_of: :translations
     end
 
     class_methods do
-      def exhibit_default_scope(exhibit)
-        default_scope { where(exhibit: exhibit) }
+      def current_exhibit
+        Thread.current[:current_exhibit]
+      end
+
+      def current_exhibit=(exhibit)
+        Thread.current[:current_exhibit] = exhibit
       end
     end
   end