enjoy_cms_catalog 0.4.0 → 0.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3164514754ffb7aa08c22494d69dbb521a9cec61
-  data.tar.gz: a031dbb35eb87ca22f757a7e554f888c55305ddb
+  metadata.gz: 69bbede3b82b545b7f663831b343053fdd54f4f0
+  data.tar.gz: 77a893e100457ae28c0e1ade2e04ac59d4a5914b
 SHA512:
-  metadata.gz: 1b11e03cd5f260f7b59a1f527b47090390c81b01454a98df8bcb0c707e488c87cca8df01797ee2f48bdfb8ee43d7f5d7d4c423345b6fb8c9347caeb1864f239b
-  data.tar.gz: 49559c18f178a4e1a823a986cf45c8563d2929433fac2998782cdd3ba53be0a9f190875acf0bcd70c63e4c71d5fa8350238a9f493e86d8dcd259d302dda53b30
+  metadata.gz: 8ba084b92faba5313b19e2867479df8cfb57c44df4cc66faa8ca6942a1d8715eead963ed23510696aabbbba32524d48e1fa8c8a29ecb6b72cd9ee8f4357d0fdc
+  data.tar.gz: 53902f9b6ca970c23fb62d3ea3d99207b13d9d20ad864f5f88248c7aeceeae6d0d1deedce8b3cabc82b1f1b719d277f4d6d3fa9481242ff3810d82fb76e5431d

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

@@ -4,7 +4,7 @@ module Enjoy::Catalog
       extend ActiveSupport::Concern
 
       included do
-        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support and insert_breadcrumbs
           add_breadcrumb I18n.t('enjoy.breadcrumbs.catalog'), :enjoy_catalog_path
         end
       end
@@ -26,7 +26,7 @@ module Enjoy::Catalog
         @children = @category.children.enabled.sorted.all.to_a
         @items = @category.items.enabled.sorted.all.to_a
 
-        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support and insert_breadcrumbs
           add_breadcrumb @category.name, url_for(@category)
         end
 
@@ -51,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

@@ -4,7 +4,7 @@ module Enjoy::Catalog
       extend ActiveSupport::Concern
 
       included do
-        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support and insert_breadcrumbs
           add_breadcrumb I18n.t('enjoy.breadcrumbs.items'), :enjoy_items_path
         end
       end
@@ -25,7 +25,7 @@ module Enjoy::Catalog
           return true
         end
 
-        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support and insert_breadcrumbs
           add_breadcrumb @item.name, url_for(@item)
         end
       end
@@ -38,13 +38,17 @@ module Enjoy::Catalog
         Enjoy::Catalog::Item
       end
       def page_title
-        if @item.class.name == model.name
+        if @item
           @item.page_title
         else
           super
         end
       end
 
+      def insert_breadcrumbs
+        true
+      end
+
     end
   end
 end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.4.0"
+    VERSION = "0.4.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler