From cdf61472e92fa94176cab6e7ba0e8dc2931ea69e Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 10 Oct 2023 16:09:31 -0400 Subject: [PATCH] tell blacklight we are still using bootstrap 4 --- Gemfile | 1 + app/controllers/catalog_controller.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index c1f67a8c3..5732aa0c5 100644 --- a/Gemfile +++ b/Gemfile @@ -100,6 +100,7 @@ gem 'jbuilder', '~> 2.5' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.4.4', require: false +# note if updating to 5, you should change bootstrap_version config in catalog_controller gem 'bootstrap', '~> 4.6', '>= 4.6.2' gem 'sprockets-rails', '>= 3.4.2' diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 103c32002..077c5ed29 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -155,6 +155,9 @@ def active_sort_fields # We overide to use custom sub-class for Solr HTTP retries config.repository_class = Scihist::BlacklightSolrRepository + # We need to tell Blacklight we use bootstrap 4, not yet 5 + config.bootstrap_version = 4 + ## Class for converting Blacklight's url parameters to into request parameters for the search index # config.search_builder_class = ::SearchBuilder