Don't scope exhibit_navbar_comoponent setting to view type

projectblacklight · Oct 7, 2024 · 0ccd661 · 0ccd661
1 parent 5fd1d64
commit 0ccd661
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/shared/_exhibit_navbar.html.erb b/app/views/shared/_exhibit_navbar.html.erb
@@ -1,2 +1,2 @@
-<%= render (blacklight_config&.view_config(document_index_view_type)&.exhibit_navbar_component || Spotlight::ExhibitNavbarComponent).new %>
-<% Spotlight.deprecator.warn("_exhibit_navbar.html.erb will be removed.  Customize the exhibit navbar using components instead.") %>
+<%- Spotlight.deprecator.warn("_exhibit_navbar.html.erb will be removed.  Customize the exhibit navbar using components instead.") %>
+<%= render (blacklight_config&.exhibit_navbar_component || Spotlight::ExhibitNavbarComponent).new %>
diff --git a/lib/generators/spotlight/templates/catalog_controller.rb b/lib/generators/spotlight/templates/catalog_controller.rb
@@ -16,7 +16,7 @@ class CatalogController < ApplicationController
     # Blacklight 8 sets a default value to 'advanced'
     config.json_solr_path = nil
     config.header_component = Spotlight::HeaderComponent
-    config.index.exhibit_navbar_component = Spotlight::ExhibitNavbarComponent
+    config.exhibit_navbar_component = Spotlight::ExhibitNavbarComponent
     config.document_solr_path = 'get'
     config.document_unique_id_param = 'ids'
 

diff --git a/spec/test_app_templates/catalog_controller.rb b/spec/test_app_templates/catalog_controller.rb
@@ -7,7 +7,7 @@ class CatalogController < ApplicationController
 
   configure_blacklight do |config|
     config.header_component = Spotlight::HeaderComponent
-    config.index.exhibit_navbar_component = Spotlight::ExhibitNavbarComponent
+    config.exhibit_navbar_component = Spotlight::ExhibitNavbarComponent
     config.view.gallery(document_component: Blacklight::Gallery::DocumentComponent, icon: Blacklight::Gallery::Icons::GalleryComponent)
     # config.view.gallery.classes = 'row-cols-2 row-cols-md-3'
     config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent, icon: Blacklight::Gallery::Icons::MasonryComponent)