<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -5,13 +5,13 @@ This is an extension that adds sort and search support for products inside Spree
 ## Install
       script/extension install git://github.com/edmundo/spree-search.git
 
-You need to uncomment two methods (that builds the products collection) on search_extension.rb to make simple search work.
+You need to uncomment two methods (that builds the products collection) on products_controller.rb and taxons_controller.rb to make simple search work.
 
 ## Actual state
 Production ready. Updated to work with the latest i18n code.
 
 ## Functionality
-It includes basic name search that is suggested to be putted in a layout. It can be used in the main page or inside a taxon.
+It includes basic name search that is suggested to be putted in the main layout. It can be used through the main page or inside a taxon.
 It can be tested using the following route:
 /search/test
 </diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -1,33 +1,33 @@
 class ProductsController &lt; Spree::BaseController
-# Uncomment this method to make the simple search work for products.
   private
 
-  def collection
-    # Define what is allowed.
-    sort_params = {
-      &quot;price_asc&quot; =&gt; [&quot;master_price&quot;, &quot;ASC&quot;],
-      &quot;price_desc&quot; =&gt; [&quot;master_price&quot;, &quot;DESC&quot;],
-      &quot;date_asc&quot; =&gt; [&quot;available_on&quot;, &quot;ASC&quot;],
-      &quot;date_desc&quot; =&gt; [&quot;available_on&quot;, &quot;DESC&quot;],
-      &quot;name_asc&quot; =&gt; [&quot;name&quot;, &quot;ASC&quot;],
-      &quot;name_desc&quot; =&gt; [&quot;name&quot;, &quot;DESC&quot;]
-    }
-    # Set it to what is allowed or default.
-    @sort_by_and_as = sort_params[params[:sort]] || [&quot;available_on&quot;, &quot;DESC&quot;]
-    # If setted to default, clean the param it doesn't need to clutter the url.
-    params[:sort] = nil if @sort_by_and_as == [&quot;available_on&quot;, &quot;DESC&quot;]
-
-#    @search_param = &quot;- #{t('ext.search.searching_by', :search_term =&gt; params[:keywords])}&quot; if params[:keywords]
-
-    @search = Product.active.new_search(params[:search])
-    @search.order_by = @sort_by_and_as[0]
-    @search.order_as = @sort_by_and_as[1]
-    @search.conditions.name_contains = params[:keywords]
-
-    @search.per_page = Spree::Config[:products_per_page]
-    @search.include = :images
-
-    @product_cols = 3
-    @products ||= @search.all
-  end
+# Uncomment this method to make the simple search work for products.
+#  def collection
+#    # Define what is allowed.
+#    sort_params = {
+#      &quot;price_asc&quot; =&gt; [&quot;master_price&quot;, &quot;ASC&quot;],
+#      &quot;price_desc&quot; =&gt; [&quot;master_price&quot;, &quot;DESC&quot;],
+#      &quot;date_asc&quot; =&gt; [&quot;available_on&quot;, &quot;ASC&quot;],
+#      &quot;date_desc&quot; =&gt; [&quot;available_on&quot;, &quot;DESC&quot;],
+#      &quot;name_asc&quot; =&gt; [&quot;name&quot;, &quot;ASC&quot;],
+#      &quot;name_desc&quot; =&gt; [&quot;name&quot;, &quot;DESC&quot;]
+#    }
+#    # Set it to what is allowed or default.
+#    @sort_by_and_as = sort_params[params[:sort]] || [&quot;available_on&quot;, &quot;DESC&quot;]
+#    # If setted to default, clean the param it doesn't need to clutter the url.
+#    params[:sort] = nil if @sort_by_and_as == [&quot;available_on&quot;, &quot;DESC&quot;]
+#
+##    @search_param = &quot;- #{t('ext.search.searching_by', :search_term =&gt; params[:keywords])}&quot; if params[:keywords]
+#
+#    @search = Product.active.new_search(params[:search])
+#    @search.order_by = @sort_by_and_as[0]
+#    @search.order_as = @sort_by_and_as[1]
+#    @search.conditions.name_contains = params[:keywords]
+#
+#    @search.per_page = Spree::Config[:products_per_page]
+#    @search.include = :images
+#
+#    @product_cols = 3
+#    @products ||= @search.all
+#  end
 end</diff>
      <filename>app/controllers/products_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -44,9 +44,6 @@ class SearchesController &lt; Spree::BaseController
     # If setted to default, clean the param it doesn't need to clutter the url.
     params[:sort] = nil if @sort_by_and_as == [&quot;available_on&quot;, &quot;DESC&quot;]
 
-#    @search_param = &quot;- #{t('ext.search.searching_by', :search_term =&gt; params[:keywords])}&quot; if params[:keywords]
-
-
     @search = Product.active.new_search(params[:search])
 
     if params[:taxon]</diff>
      <filename>app/controllers/searches_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,33 +1,33 @@
 class TaxonsController &lt; Spree::BaseController
-# Uncomment this method to make the simple search work inside taxons.
   private
 
-  def load_data
-    # Define what is allowed.
-    sort_params = {
-      &quot;price_asc&quot; =&gt; [&quot;master_price&quot;, &quot;ASC&quot;],
-      &quot;price_desc&quot; =&gt; [&quot;master_price&quot;, &quot;DESC&quot;],
-      &quot;date_asc&quot; =&gt; [&quot;available_on&quot;, &quot;ASC&quot;],
-      &quot;date_desc&quot; =&gt; [&quot;available_on&quot;, &quot;DESC&quot;],
-      &quot;name_asc&quot; =&gt; [&quot;name&quot;, &quot;ASC&quot;],
-      &quot;name_desc&quot; =&gt; [&quot;name&quot;, &quot;DESC&quot;]
-    }
-    # Set it to what is allowed or default.
-    @sort_by_and_as = sort_params[params[:sort]] || [&quot;available_on&quot;, &quot;DESC&quot;]
-    # If setted to default, clean the param it doesn't need to clutter the url.
-    params[:sort] = nil if @sort_by_and_as == [&quot;available_on&quot;, &quot;DESC&quot;]
-
-#    @search_param = &quot;- #{t('ext.search.searching_by', :search_term =&gt; params[:keywords])}&quot; if params[:keywords]
-
-    @search = object.products.active.new_search(params[:search])
-    @search.order_by = @sort_by_and_as[0]
-    @search.order_as = @sort_by_and_as[1]
-    @search.conditions.name_contains = params[:keywords]
-
-    @search.per_page = Spree::Config[:products_per_page]
-    @search.include = :images
-
-    @product_cols = 3
-    @products ||= @search.all
-  end
+# Uncomment this method to make the simple search work inside taxons.
+#  def load_data
+#    # Define what is allowed.
+#    sort_params = {
+#      &quot;price_asc&quot; =&gt; [&quot;master_price&quot;, &quot;ASC&quot;],
+#      &quot;price_desc&quot; =&gt; [&quot;master_price&quot;, &quot;DESC&quot;],
+#      &quot;date_asc&quot; =&gt; [&quot;available_on&quot;, &quot;ASC&quot;],
+#      &quot;date_desc&quot; =&gt; [&quot;available_on&quot;, &quot;DESC&quot;],
+#      &quot;name_asc&quot; =&gt; [&quot;name&quot;, &quot;ASC&quot;],
+#      &quot;name_desc&quot; =&gt; [&quot;name&quot;, &quot;DESC&quot;]
+#    }
+#    # Set it to what is allowed or default.
+#    @sort_by_and_as = sort_params[params[:sort]] || [&quot;available_on&quot;, &quot;DESC&quot;]
+#    # If setted to default, clean the param it doesn't need to clutter the url.
+#    params[:sort] = nil if @sort_by_and_as == [&quot;available_on&quot;, &quot;DESC&quot;]
+#
+##    @search_param = &quot;- #{t('ext.search.searching_by', :search_term =&gt; params[:keywords])}&quot; if params[:keywords]
+#
+#    @search = object.products.active.new_search(params[:search])
+#    @search.order_by = @sort_by_and_as[0]
+#    @search.order_as = @sort_by_and_as[1]
+#    @search.conditions.name_contains = params[:keywords]
+#
+#    @search.per_page = Spree::Config[:products_per_page]
+#    @search.include = :images
+#
+#    @product_cols = 3
+#    @products ||= @search.all
+#  end
 end</diff>
      <filename>app/controllers/taxons_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,5 +4,5 @@
 
 &lt;%= render :partial =&gt; &quot;shared/products.html.erb&quot;, :locals =&gt; {:products =&gt; @products, :taxon =&gt; @taxon } %&gt;
 
-&lt;%= render :partial =&gt; &quot;shared/advanced_search_sort_bar&quot; %&gt;
+&lt;%= render :partial =&gt; &quot;shared/sort_bar&quot; %&gt;
 &lt;%= page_links(maintain_search_params.merge(:prev =&gt; &quot;&amp;#171; #{t('previous')}&quot;, :next =&gt; &quot;#{t('next')} &amp;#187;&quot;)) if @search.page_count &gt; 1 %&gt;</diff>
      <filename>app/views/searches/show.html.erb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/views/products/index.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/shared/_advanced_search_paginate.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/shared/_advanced_search_sort_bar.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/shared/_login_bar.html.erb</filename>
    </removed>
    <removed>
      <filename>app/views/taxons/show.html.erb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>07186759b799148f40992379fe5c12f888a3491f</id>
    </parent>
  </parents>
  <author>
    <name>Edmundo Valle Neto</name>
    <email>edmundo.vn@gmail.com</email>
  </author>
  <url>http://github.com/edmundo/spree-search/commit/e666a4a77b6a32a6e461ce78b6ea7a843cfe880a</url>
  <id>e666a4a77b6a32a6e461ce78b6ea7a843cfe880a</id>
  <committed-date>2009-06-01T12:09:27-07:00</committed-date>
  <authored-date>2009-06-01T12:09:27-07:00</authored-date>
  <message>Changed the extension to not override any view or change controllers by default.</message>
  <tree>e9148c03bb8ac32ab578719c166e3656a118955c</tree>
  <committer>
    <name>Edmundo Valle Neto</name>
    <email>edmundo.vn@gmail.com</email>
  </committer>
</commit>
