Fixed bug where taxon display would not work correctly

iloveitaly · May 7, 2012 · 19163b3 · 19163b3
1 parent a5ab8a6
commit 19163b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/overrides/add_search_pagination.rb b/app/overrides/add_search_pagination.rb
@@ -2,5 +2,4 @@
                       :name => "add_sunspot_search_pagination", 
                       :replace => "code[erb-silent]:contains('if paginated_products.respond_to')",
                       :closing_selector => "code[erb-silent]:contains('end')",
-                      :original => "<%= helper_method %>",
-                      :text => "<%= paginate @searcher.sunspot.hits %>")
+                      :text => "<%= paginate @searcher.sunspot.hits unless params.has_key? 'taxon' %>")
diff --git a/lib/spree/search/spree_sunspot.rb b/lib/spree/search/spree_sunspot.rb
@@ -7,7 +7,7 @@ def retrieve_products
           #     - we are sending the block value as a method
           #     - Spree::Search::Base is using method_missing() to return the param values
 
-          (PRODUCT_OPTION_FACETS + PRODUCT_PROPERTY_FACETS + PRODUCT_OTHER_FACETS + [:taxon_name]).each do |name|
+          (PRODUCT_OPTION_FACETS + PRODUCT_PROPERTY_FACETS + PRODUCT_OTHER_FACETS + PRODUCT_SHOW_FACETS).each do |name|
             with("#{name}_facet", send(name)) if send(name)
             facet("#{name}_facet")
           end
@@ -39,6 +39,9 @@ def prepare(params)
 
         @properties[:sort] = params[:sort] || :score
         @properties[:order] = params[:order] || :desc
+
+        # when taxon navigation is in place, Spree::TaxonsController passes :taxon in params
+        @properties[:taxon_name_facet] = params[:taxon] unless params[:taxon].blank?
 
         (PRODUCT_OPTION_FACETS + PRODUCT_PROPERTY_FACETS + PRODUCT_OTHER_FACETS + PRODUCT_SHOW_FACETS).each do |name|
           @properties[name] = params["#{name}_facet"]