Merge branch 'blacklight_advanced_and_range' into adventist_dev

app/controllers/catalog_controller.rb

@@ -123,15 +123,16 @@ def self.uploaded_field
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
-    Rails.root.glob("config/locales/*.yml").each do |path|
-      I18n.load_path << path.to_s
-    end
-    I18n.backend.reload!
-    index_props = DogBiscuits.config.index_properties.collect do |prop|
-      { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
-    end
-    add_index_field config, index_props
+    # TODO ROB
+#     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
+#     Rails.root.glob("config/locales/*.yml").each do |path|
+#       I18n.load_path << path.to_s
+#     end
+#     I18n.backend.reload!
+#     index_props = DogBiscuits.config.index_properties.collect do |prop|
+#       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
+#     end
+#     add_index_field config, index_props
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display

config/routes.rb

@@ -6,6 +6,7 @@
 
 Rails.application.routes.draw do # rubocop:disable Metrics/BlockLength
   resources :identity_providers
+  concern :range_searchable, BlacklightRangeLimit::Routes::RangeSearchable.new
   concern :iiif_search, BlacklightIiifSearch::Routes.new
   concern :oai_provider, BlacklightOaiProvider::Routes.new