enjoy_cms_catalog 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02040c55e61a9e34c8812b356d54717f9a091011
-  data.tar.gz: 8aa5f0a98eed2fa24676ace159fa789ee3bfad13
+  metadata.gz: 0117875d71ca0a24bdd0fcdec9fdcfe6260d3b0a
+  data.tar.gz: a53ecb5661763f15fca3c876919ff8bff15d585e
 SHA512:
-  metadata.gz: 43fd56572ccb3f0fafee41bcdd149633fe86a13e17e5f7b2f1aca294874c14838317b2a36c8e8b7c8ca13171341d873935f2cfa50692d30a98cb9acc33a47d6a
-  data.tar.gz: dabe729458c59a7ae1b183c896230aa2572de8e7a366f99d3875c302c4cd3273f9f0273dcc46691db28325b730e6f921ad29c2b2572a40c32d96931f16d6ef8e
+  metadata.gz: 7653b0246035cc8f77f78a8a1f4c09199df29151b5ccb3c6d0b61baf4ab85be54e111e2780db2698624659fa2e0937fb202750d82b07dd49650210139ff6d83e
+  data.tar.gz: 31daed42107fbdabf5fa43ab19a6a750963aa16ef497eb6dcd168788e060de5750ffa876be866e66704bd7d0218dd8dcad582b46cb97bcbcf0999a57ece5873a

data/enjoy_cms_catalog.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'money-rails'
   spec.add_dependency 'mongoid_money_field'
 
-  spec.add_dependency 'enjoy_cms', "~> 0.3.5"
+  spec.add_dependency 'enjoy_cms', "~> 0.3.7"
 end

data/lib/enjoy/catalog/admin/item.rb

@@ -6,19 +6,30 @@ module Enjoy::Catalog
           list do
             scopes [:sorted, :enabled, nil]
 
-            field :enabled, :toggle
-            field :name
-            field :price
-            field :item_categories
+            field :enabled, :toggle do
+              searchable false
+            end
+            field :name do
+              searchable true
+            end
+            field :item_categories do
+              searchable :name
+            end
             field :connected_pages, :enjoy_connectable
-            field :image
           end
 
           edit do
             field :enabled, :toggle
             field :name
-            field :connected_pages, :enjoy_connectable
-            field :item_categories
+            field :connected_pages, :enjoy_connectable do
+              read_only do
+                !bindings[:view].current_user.admin?
+              end
+            end
+            field :item_categories do
+              searchable :name
+            end
+            field :price
 
             group :URL do
               active false
@@ -43,6 +54,8 @@ module Enjoy::Catalog
                   :image_jcrop_options
                 end
               end
+
+              field :item_images
             end
 
             group :content do
@@ -51,8 +64,6 @@ module Enjoy::Catalog
               field :content, :enjoy_html
             end
 
-            field :item_images
-
             Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
             group :seo do

data/lib/enjoy/catalog/admin/item_category.rb

@@ -7,22 +7,13 @@ module Enjoy::Catalog
           list do
             scopes [:sorted, :enabled, nil]
 
-            field :enabled, :toggle
-            field :name
-            field :image
-            field :connected_pages, :enjoy_connectable
-
-            field :items do
-              read_only true
-
-              pretty_value do
-                bindings[:object].items.to_a.map { |i|
-                  route = (bindings[:view] || bindings[:controller])
-                  model_name = i.rails_admin_model
-                  route.link_to(i.name, route.rails_admin.show_path(model_name: model_name, id: i.id), title: i.name)
-                }.join("<br>").html_safe
-              end
+            field :enabled, :toggle do
+              searchable false
+            end
+            field :name do
+              searchable true
             end
+            field :connected_pages, :enjoy_connectable
           end
 
           edit do
@@ -44,10 +35,16 @@ module Enjoy::Catalog
               end
               field :text_slug
             end
-            field :image, :jcrop do
-              jcrop_options do
-                :image_jcrop_options
+
+
+            group :image do
+              active false
+              field :image, :jcrop do
+                jcrop_options do
+                  :image_jcrop_options
+                end
               end
+              field :item_category_images
             end
 
             group :content do
@@ -56,8 +53,6 @@ module Enjoy::Catalog
               field :content, :enjoy_html
             end
 
-            field :item_category_images
-
             Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
             group :seo do

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
 description: Items catalog with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru