Pass url options through to blacklight url helpers

projectblacklight · May 1, 2017 · c46a07d · c46a07d
1 parent 9886e28
commit c46a07d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/concerns/blacklight/controller.rb b/app/controllers/concerns/blacklight/controller.rb
@@ -87,7 +87,7 @@ def search_action_url options = {}
 
   def search_action_path *args
     if args.first.is_a? Hash
-      args.first[:only_path] = true
+      args.first[:only_path] = true if args.first[:only_path].nil?
     end
 
     search_action_url(*args)
@@ -101,7 +101,7 @@ def search_facet_url options = {}
 
   def search_facet_path(options = {})
     Deprecation.silence(Blacklight::Controller) do
-      search_facet_url(options.merge(only_path: true))
+      search_facet_url(options.reverse_merge(only_path: true))
     end
   end
 

diff --git a/app/helpers/blacklight/facets_helper_behavior.rb b/app/helpers/blacklight/facets_helper_behavior.rb
@@ -131,12 +131,12 @@ def render_facet_value(facet_field, item, options = {})
   # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
   # @param [String] item
   # @return [String]
-  def path_for_facet(facet_field, item)
+  def path_for_facet(facet_field, item, path_options = {})
     facet_config = facet_configuration_for_field(facet_field)
     if facet_config.url_method
       send(facet_config.url_method, facet_field, item)
     else
-      search_action_path(search_state.add_facet_params_and_redirect(facet_field, item))
+      search_action_path(search_state.add_facet_params_and_redirect(facet_field, item).merge(path_options))
     end
   end
 

diff --git a/app/views/catalog/index.json.jbuilder b/app/views/catalog/index.json.jbuilder
@@ -33,13 +33,13 @@ json.included do
             json.hits item['hits']
           end
           json.links do
-            json.self path_for_facet(facet['name'], item['value'])
+            json.self path_for_facet(facet['name'], item['value'], only_path: false)
           end
         end
       end
     end
     json.links do
-      json.self search_facet_url(id: facet['name'])
+      json.self search_facet_path(id: facet['name'], only_path: false)
     end
   end