Changeset 1152
- Timestamp:
- 09/28/06 21:03:50 (2 years ago)
- Files:
-
- peasantonline/app/controllers/application.rb (modified) (1 diff)
- peasantonline/app/controllers/catalog_controller.rb (modified) (3 diffs)
- peasantonline/app/views/catalog/_left_nav.rhtml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
peasantonline/app/controllers/application.rb
r1151 r1152 14 14 @categories = Category.find(:all, :order => "name") 15 15 @cart = find_cart 16 @product_gender = nil 16 17 end 17 18 end peasantonline/app/controllers/catalog_controller.rb
r1151 r1152 27 27 @designer = humanize_param(params[:designer]) 28 28 if params[:gender] == "men" 29 gender_val = false29 @gender_val = false 30 30 else 31 gender_val = true31 @gender_val = true 32 32 end 33 33 34 34 @des_obj = Designer.find_by_name(@designer) 35 35 #@products = Product.find_all_by_designer(@des_obj.id) 36 @product_pages, @products = paginate(:products, :per_page => 9, :conditions => "designer = '#{@des_obj.id}' and gender = #{ gender_val}")36 @product_pages, @products = paginate(:products, :per_page => 9, :conditions => "designer = '#{@des_obj.id}' and gender = #{@gender_val}") 37 37 38 38 end … … 42 42 def browse_by_category 43 43 @category = humanize_param(params[:category]) 44 @product_gender = "n/a" 44 45 if params[:gender] == "men" 45 gender_val = false46 @gender_val = false 46 47 else 47 gender_val = true48 @gender_val = true 48 49 end 49 50 50 51 @cat_obj = Category.find_by_name(@category) 51 52 #@products = Product.find_all_by_category(@cat_obj.id) 52 @product_pages, @products = paginate(:products, :per_page => 9, :conditions => "category = '#{@cat_obj.id}' and gender = #{ gender_val}")53 @product_pages, @products = paginate(:products, :per_page => 9, :conditions => "category = '#{@cat_obj.id}' and gender = #{@gender_val}") 53 54 end 54 55 55 56 def browse_by_gender 56 57 @gender = humanize_param(params[:gender]) 58 @product_gender = "n/a" 57 59 if params[:gender] == "men" 58 60 gender_val = false … … 74 76 ProductImage.find(:all, :conditions => ["product = ?", params[:product]]) 75 77 @product_images = ProductImage.find_all_by_product(params[:product]) 78 79 80 if @product.gender == false 81 @product_gender = "men" 82 else 83 @product_gender = "women" 84 end 76 85 end 77 86 peasantonline/app/views/catalog/_left_nav.rhtml
r1151 r1152 8 8 <% gender_list = ['men','women']%> 9 9 <% for gender in gender_list %> 10 <% gender_bool = (gender == "women") %> 10 11 <div class="gender_block"> 11 12 <div class="subhead"><a href="<%= shop_by_gender_url(:gender => gender ) %>"><%= gender.capitalize %>'s items</a></div> 12 <%if params[:gender] == gender || !params[:gender]%>13 <%if params[:gender] == gender || (!params[:gender] && gender == @product_gender) || @product_gender == nil %> 13 14 <% if @designers %> 14 15 <select onchange="if( this.selectedIndex != 0 ) {location.href = this.options[this.selectedIndex].value;}"> 15 16 <option value=""> Select a Designer: </option> 16 17 <% for designer in @designers %> 17 <option value="<%= shop_by_designer_url(:gender=>gender, :designer => make_linkable( designer.name )) %>"> 18 19 <% 20 @nav_products = Product.find(:all, :conditions => "designer = '#{designer.id}' and gender = #{gender_bool}") 21 if @nav_products.length > 0 22 %> 23 <option value="<%= shop_by_designer_url(:gender=>gender, :designer => make_linkable( designer.name )) %>"> 18 24 <%= canonicalize_designer( designer.name ) %> 19 25 </option> 26 <% end %> 20 27 <% end %> 21 28 </select> … … 24 31 <% if @categories %> 25 32 <ul> 26 <% for category in @categories %> 33 <% for category in @categories %> 34 <% 35 @nav_products = Product.find(:all, :conditions => "category = '#{category.id}' and gender = #{gender_bool}") 36 if @nav_products.length > 0 37 %> 27 38 <li><a href="<%= shop_by_category_url(:gender => gender,:category => make_linkable( category.name )) %>"><%= category.name.capitalize %></a></li> 39 <% 40 end 41 %> 28 42 <% end %> 29 </ul>43 </ul> 30 44 <% end %> 31 45 <% end %>