db/migrate/20091104151730_add_some_indexes.rb @@ -10,12 +10,6 @@ class ProductsController < Spree::BaseController include Spree::Search - index do - before do - @product_cols = 3 - end - end - def change_image @product = Product.available.find_by_param(params[:id]) img = Image.find(params[:image_id]) @@ -25,8 +19,12 @@ class ProductsController < Spree::BaseController private def load_data - load_object - @selected_variant = @product.variants.detect { |v| v.available? } + #load_object + @variants = Variant.active.find_all_by_product_id(@product.id, + :include => [:option_values, :images]) + @product_properties = ProductProperty.find_all_by_product_id(@product.id, + :include => [:property]) + @selected_variant = @variants.detect { |v| v.available? } referer = request.env['HTTP_REFERER'] app/controllers/products_controller.rb @@ -3,7 +3,7 @@ class Spree::BaseController < ActionController::Base helper :application before_filter :instantiate_controller_and_action_names filter_parameter_logging :password, :password_confirmation, :number, :verification_value - helper_method :current_user_session, :current_user, :title, :set_title + helper_method :current_user_session, :current_user, :title, :set_title, :get_taxonomies # Pick a unique cookie name to distinguish our session data from others' session_options['session_key'] = '_spree_session_id' @@ -17,23 +17,23 @@ class Spree::BaseController < ActionController::Base User.first(:include => :roles, :conditions => ["roles.name = 'admin'"]) end - # retrieve the order_id from the session and then load from the database (or return a new order if no + # retrieve the order_id from the session and then load from the database (or return a new order if no # such id exists in the session) - def find_order + def find_order unless session[:order_id].blank? @order = Order.find_or_create_by_id(session[:order_id]) - else + else @order = Order.create end session[:order_id] = @order.id session[:order_token] = @order.token @order end - + def access_forbidden render :text => 'Access Forbidden', :layout => true, :status => 401 end - + # Used for pages which need to render certain partials in the middle # of a view. Ex. Extra user form fields def initialize_extension_partials @@ -45,7 +45,7 @@ class Spree::BaseController < ActionController::Base def set_title(title) @title = title end - + def title if @title.blank? default_title @@ -53,11 +53,11 @@ class Spree::BaseController < ActionController::Base @title end end - + def default_title Spree::Config[:site_name] end - + protected def reject_unknown_object # workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?) @@ -75,7 +75,7 @@ class Spree::BaseController < ActionController::Base render_404(Exception.new("missing object in #{self.class.to_s}")) end end - return true + true end def render_404(exception) @@ -153,8 +153,12 @@ class Spree::BaseController < ActionController::Base def instantiate_controller_and_action_names @current_action = action_name @current_controller = controller_name + end - @taxonomies = Taxonomy.find(:all, :include => {:root => :children}) + def get_taxonomies + @taxonomies ||= Taxonomy.find(:all, :include => {:root => :children}) + @taxonomies end end + app/controllers/spree/base_controller.rb @@ -13,10 +13,11 @@ <h2><%= t('variants') %></h2> <ul> <% has_checked = false - @product.variants.active.each_with_index do |v,index| + @variants.each do |v| next if v.option_values.empty? || (!Spree::Config[:show_zero_stock_products] && !v.in_stock?) checked = !has_checked && (Spree::Config[:allow_backorders] || v.in_stock?) has_checked = true if checked %> + <li> <label> <%= radio_button_tag "products[#{@product.id}]", v.id, checked, :disabled => !Spree::Config[:allow_backorders] && !v.in_stock? %> app/views/products/_cart_form.html.erb @@ -1,6 +1,6 @@ -<% unless @product.product_properties.empty? %> +<% unless @product_properties.empty? %> <dl> -<% for product_property in @product.product_properties %> +<% for product_property in @product_properties %> <dt><%= product_property.property.presentation %></dt> <dd><%= product_property.value %></dd> <% end %> app/views/products/_properties.html.erb @@ -2,9 +2,11 @@ <div id="taxon-crumbs"> <h3><%= t('look_for_similar_items') -%></h3> <div> + <ul id='similar_items_by_taxon'> <% @product.taxons.each do |taxon| -%> - <%= taxon_crumbs(taxon) -%> + <li><%= link_to taxon.name, "/t/#{taxon.permalink}" %></li> <% end -%> + </ul> </div> </div> <% end -%> app/views/products/_taxons.html.erb @@ -7,11 +7,11 @@ </ul> <% end %> -<% if @product.has_variants? +<% if @product.has_variants? has_checked = false %> <h4 id="variant-images"><%= t('images_for') %>: <%= @selected_variant.options_text %></h4> <ul id="variant-thumbnails" class="thumbnails"> - <% product.variants.each do |v| + <% @variants.each do |v| checked = !has_checked && (v.available?) has_checked = true if checked @@ -28,7 +28,7 @@ <script type="text/javascript" charset="utf-8"> var images = new Array(); - <% product.variants.each do |v| %> + <% @variants.each do |v| %> images[<%= v.id.to_s %>] = new Array(); <% v.images.each_with_index do |image, i| %> images[<%= v.id.to_s %>][<%= i %>] = '<%= image.attachment.url(:mini) %>'; @@ -55,4 +55,4 @@ jQuery(document).ready(function(){ add_image_handlers(); }); </script> -<% end %> \ No newline at end of file +<% end %> app/views/products/_thumbnails.html.erb @@ -1,5 +1,5 @@ <div id="taxonomies" class="sidebar-item"> -<% @taxonomies.each do |taxonomy| %> +<% get_taxonomies.each do |taxonomy| %> <ul class="navigation-list"> <li<%= ' class="current"' if @taxon && @taxon == taxonomy.root %>><%= link_to t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize), seo_url(taxonomy.root), :class => 'root' %></li> <% taxonomy.root.children.each do |taxon| %> @@ -7,4 +7,4 @@ <% end %> </ul> <% end %> -</div> \ No newline at end of file +</div> app/views/shared/_taxonomies.html.erb @@ -22,6 +22,7 @@ module Spree::Search @products_scope = @product_group.apply_on(base_scope) @products = @products_scope.paginate({ + :include => [:images, {:variants => :images}], :per_page => params[:per_page], :page => params[:page], }) lib/spree/search.rb b1045568211adad778e2a7d3b18a2d31a7acade9 Roman Smirnov roman@railsdog.com http://github.com/railsdog/spree/commit/e38f8642afbb462571edf4648bbb905d8b7e7409 e38f8642afbb462571edf4648bbb905d8b7e7409 2009-11-06T13:57:09-08:00 2009-11-04T11:52:16-08:00 Added some indexes and reduced count of SQL-queries. [#863 state:resolved] d2561ebc13ccaee5320acdd081cf8410f0134e66 Sean Schofield sean@railsdog.com