enjoy_cms_catalog 0.4.0.3 → 0.4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2810464e954489963b2130c0336529162fe711cc
-  data.tar.gz: 5e83114cac2f7fbbfab56ce3dcd9a22b837f70d2
+  metadata.gz: edde50b4433ff6776e6b8d22901ba0e41b334e40
+  data.tar.gz: fdbce49d7fa7f0fadc43c452ef7ec1dc8b1a2ef6
 SHA512:
-  metadata.gz: f4dd7c53c72ba0b3fdd36e6082ee481270c4d9ba0c4e82e18ca4fc569345ab701390e9433e602b5b1d1c6081809f71bc9aaf9f700ea6400f376fd2d8cb8cb573
-  data.tar.gz: ee2ed9fd6e141c3d987299590a0be8a3cd70accb65afd2bb18b8378b087d5da226617fa91debd408c0c0a6a7873304c52a08a3f0adcfd4b2e46bf1eaba195681
+  metadata.gz: 4e3bbd171f9cb45ddbc6c138eae458a81a9de3884cd7a31473651aad07d00c28bc54816dc0ca4103aa6d00ca8a426e47f9a480955f4716297e6927d29ca50fde
+  data.tar.gz: 8fe619a6ca6703fcb3313f3453fa939091f0dfb6330ba77e98b9943a11ad191fdddf93fb738e86d036e2bef7298bd49826c95e7933fbf1454e3cf839bff48bf9

data/lib/enjoy/catalog/controllers/categories.rb

@@ -3,13 +3,9 @@ module Enjoy::Catalog
     module Categories
       extend ActiveSupport::Concern
 
-      def insert_breadcrumbs
-        true
-      end
-
       included do
         if Enjoy::Catalog.config.breadcrumbs_on_rails_support
-          add_breadcrumb I18n.t('enjoy.breadcrumbs.catalog'), :enjoy_catalog_path if insert_breadcrumbs
+          add_breadcrumb I18n.t('enjoy.breadcrumbs.catalog'), :enjoy_catalog_path, if: :insert_breadcrumbs
         end
       end
 
@@ -31,7 +27,7 @@ module Enjoy::Catalog
         @items = @category.items.enabled.sorted.all.to_a
 
         if Enjoy::Catalog.config.breadcrumbs_on_rails_support
-          add_breadcrumb @category.name, url_for(@category) if insert_breadcrumbs
+          add_breadcrumb @category.name, url_for(@category), if: :insert_breadcrumbs
         end
 
 
@@ -55,6 +51,10 @@ module Enjoy::Catalog
         Enjoy::Catalog::Item
       end
 
+      def insert_breadcrumbs
+        true
+      end
+
       # def index_crumbs
       #   if @seo_parent_page
       #     catalog_title   = Settings.ns('breadcrumbs').catalog_title(default: "Каталог", label: "'Каталог' в breadcrumbs")

data/lib/enjoy/catalog/controllers/items.rb

@@ -3,18 +3,15 @@ module Enjoy::Catalog
     module Items
       extend ActiveSupport::Concern
 
-      def insert_breadcrumbs
-        true
-      end
-
       included do
         if Enjoy::Catalog.config.breadcrumbs_on_rails_support
-          add_breadcrumb I18n.t('enjoy.breadcrumbs.items'), :enjoy_items_path if insert_breadcrumbs
+          add_breadcrumb I18n.t('enjoy.breadcrumbs.items'), :enjoy_items_path, if: :insert_items_breadcrumbs
         end
       end
 
       def index
         @item = item_class.enabled.sorted
+        insert_category_breadcrumbs if insert_breadcrumbs
 
         unless Enjoy::Catalog.config.items_per_page.nil?
           @item = @item.page(params[:page])
@@ -30,7 +27,8 @@ module Enjoy::Catalog
         end
 
         if Enjoy::Catalog.config.breadcrumbs_on_rails_support
-          add_breadcrumb @item.name, url_for(@item) if insert_breadcrumbs
+          insert_category_breadcrumbs if insert_breadcrumbs
+          add_breadcrumb @item.name, url_for(@item), if: :insert_breadcrumbs
         end
       end
 
@@ -49,6 +47,15 @@ module Enjoy::Catalog
         end
       end
 
+      def insert_breadcrumbs
+        true
+      end
+      def insert_items_breadcrumbs
+        true
+      end
+      def insert_category_breadcrumbs
+      end
+
     end
   end
 end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.4.0.3"
+    VERSION = "0.4.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.4.0.3
+  version: 0.4.0.4
 platform: ruby
 authors:
 - Alexander Kiseliev