make it possible disable BlacklightHelper loading

projectblacklight · Feb 12, 2014 · 7b35816 · 7b35816 · jrochkind · Feb 12, 2014
1 parent 12643e1
commit 7b35816
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/blacklight/engine.rb b/lib/blacklight/engine.rb
@@ -5,9 +5,15 @@ class Engine < Rails::Engine
     require 'bootstrap-sass'
     require 'blacklight/rails/routes'
 
+    config.inject_blacklight_helpers = true
+
     # BlacklightHelper is needed by all helpers, so we inject it
     # into action view base here. 
     initializer 'blacklight.helpers' do |app|
+      Blacklight::Engine.add_blacklight_helper! if Blacklight::Engine.config.inject_blacklight_helpers
+    end
+
+    def self.add_blacklight_helper!
       ActionView::Base.send :include, BlacklightHelper
     end
 

diff --git a/lib/blacklight/solr_helper.rb b/lib/blacklight/solr_helper.rb
@@ -447,7 +447,7 @@ def get_solr_response_for_doc_id(id=nil, extra_controller_params={})
     solr_params = solr_doc_params(id).merge(extra_controller_params)
     solr_response = find((blacklight_config.document_solr_request_handler || blacklight_config.qt), solr_params)
     raise Blacklight::Exceptions::InvalidSolrID.new if solr_response.docs.empty?
-    document = SolrDocument.new(solr_response.docs.first, solr_response)
+    document = wrap_solr_document_response(solr_response.docs.first, solr_response)
     [solr_response, document]
   end
 
@@ -475,7 +475,7 @@ def get_solr_response_for_field_values(field, values, extra_solr_params = {})
     }.merge(extra_solr_params)
 
     solr_response = find(blacklight_config.qt, self.solr_search_params().merge(solr_params) )
-    document_list = solr_response.docs.collect{|doc| SolrDocument.new(doc, solr_response) }
+    document_list = solr_response.docs.collect{|doc| wrap_solr_document_response(doc, solr_response) }
     [solr_response,document_list]
   end
 
@@ -570,7 +570,7 @@ def get_previous_and_next_documents_for_search(index, request_params, extra_cont
     solr_params[:facet] = false
     solr_response = find(blacklight_config.qt, solr_params)
 
-    document_list = solr_response.docs.collect{|doc| SolrDocument.new(doc, solr_response) }
+    document_list = solr_response.docs.collect{|doc| wrap_solr_document_response(doc, solr_response) }
 
     # only get the previous doc if there is one
     prev_doc = document_list.first if index > 0
@@ -644,4 +644,8 @@ def blacklight_solr
   def blacklight_solr_config
     Blacklight.solr_config
   end
+
+  def wrap_solr_document_response doc, solr_response
+    SolrDocument.new doc, solr_response
+  end
 end