Merge pull request #618 from projectblacklight/search-results-view

deprecate session[:search][:results_view], as any code consuming that in...

Author: cbeer

app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -477,10 +477,10 @@ def render_document_index_label doc, opts
   # Use the catalog_path RESTful route to create a link to the show page for a specific item.
   # catalog_path accepts a HashWithIndifferentAccess object. The solr query params are stored in the session,
   # so we only need the +counter+ param here. We also need to know if we are viewing to document as part of search results.
-  def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
+  def link_to_document(doc, opts={:label=>nil, :counter => nil})
     opts[:label] ||= blacklight_config.index.show_link.to_sym
     label = render_document_index_label doc, opts
-    link_to label, doc, { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter, :results_view].include? k  })
+    link_to label, doc, { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter].include? k  })
   end
 
   # link_back_to_catalog(:label=>'Back to Search')

lib/blacklight/catalog.rb

@@ -77,7 +77,6 @@ def show
 
     # updates the search counter (allows the show view to paginate)
     def update
-      adjust_for_results_view
       session[:search][:counter] = params[:counter]
       redirect_to :action => "show"
     end
@@ -266,13 +265,9 @@ def set_additional_search_session_values
     # we need to know if we are viewing the item as part of search results so we know whether to
     # include certain partials or not
     def adjust_for_results_view
-      if params[:results_view] == "false"
-        session[:search][:results_view] = false
-      else
-        session[:search][:results_view] = true
-      end
+      # deprecated in blacklight 4.x
+      ActiveSupport::Deprecation.warn("#adjust_for_results_view helper was deprecated in Blacklight 4.x")
     end
-    
 
     # when solr (RSolr) throws an error (RSolr::RequestError), this method is executed.
     def rsolr_request_error(exception)