Merge remote-tracking branch 'origin/hotfix-1.0.1'

Conflicts:
	app/controllers/categories_controller.rb

app/controllers/categories_controller.rb

@@ -4,7 +4,7 @@ class CategoriesController < ApplicationController
 
 
   def show
   def show
     @products = @category.products.page(params[:page])
     @products = @category.products.page(params[:page])
-    add_breadcrumb(@category.title)
+    add_breadcrumb(@category.decorate.title)
   end
   end
 
 
   private
   private

app/decorators/product_decorator.rb

@@ -16,4 +16,8 @@ class ProductDecorator < Draper::Decorator
   def image_lg_url
   def image_lg_url
     object.amazon? ? object.image_lg_url : object.image.large.url
     object.amazon? ? object.image_lg_url : object.image.large.url
   end
   end
+
+  def short_title
+    return object.title.truncate(Settings.limit_length_category_title, separator: ' ')
+  end
 end
 end
\ No newline at end of file

app/views/categories/_recommended.html.haml

 - products.each do |product|
 - products.each do |product|
   .product-item.col-md-4.text-center
   .product-item.col-md-4.text-center
     .product-title
     .product-title
-      = link_to product.title, product
+      = link_to product.decorate.short_title, product
     .product-image.img-thumbnail
     .product-image.img-thumbnail
       = image_tag product.decorate.image_md_url
       = image_tag product.decorate.image_md_url
 
 

app/views/products/_product.html.haml

@@ -4,7 +4,7 @@
       %img{src: product.decorate.image_sm_url}
       %img{src: product.decorate.image_sm_url}
   .col-md-9
   .col-md-9
     .product-title
     .product-title
-      = link_to product.title, product_path(product)
+      = link_to product.decorate.short_title, product_path(product)
   - if local_assigns.has_key?(:show_price) && show_price.present?
   - if local_assigns.has_key?(:show_price) && show_price.present?
     .col-md-2
     .col-md-2
       .product-price
       .product-price

config/settings.yml

@@ -2,6 +2,7 @@ defaults: &defaults
   limit_category: 5
   limit_category: 5
   limit_product_recommended: 6
   limit_product_recommended: 6
   limit_product_newest: 4
   limit_product_newest: 4
+  limit_length_category_title: 50
 
 
 development:
 development:
   <<: *defaults
   <<: *defaults