enjoy_cms 0.3.0.3 → 0.3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4b5b178e611666382fde0a7a3cde395a3286be
-  data.tar.gz: c9ac4904406670aba5e654e24c4a1b1db62f155c
+  metadata.gz: 7ae5da74a58d1eb3e17743f4c15776d9d7c4aff2
+  data.tar.gz: 38dd9e7610598eea2e5db3a8ca6123a8916fc5d2
 SHA512:
-  metadata.gz: 61ec8a5b08fa8100e61233c58b525d0c422227e67798dc6a2d34c4e1a77b28588a933ef889453492c1b7a8dadc552f032c3a9019771e58eec9f6b9fd273221cf
-  data.tar.gz: a35ef5829d329dbc83a7d3000a752663e86d3d87b0fb988a329123125175521a8aa3ee9b7de1e213cb32b102a017ba4c50633c751b65ea9b50a32ce19a503421
+  metadata.gz: a419713fdc0e06afb71897a2913160fad87572d66f50111c2da4916121d977fbeb9b98088a849cef0142cbadb1114e114e451e04aff1815763eb1aa56d3eb9b7
+  data.tar.gz: b77afda381a54a93dbdd2158b5744bf49f61c9c16c58539cf6660e0e8b19b1183caebb3fbd2c95eddde8da69ef5245b3344e3e96eb3124d52e6a2705bb02e747

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.0.3)
+    enjoy_cms (0.3.0.4)
       ack_rails_admin_jcrop
       addressable
       ckeditor

data/app/models/concerns/enjoy/decorators/page_block.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module PageBlock
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/concerns/enjoy/decorators/page_blockset.rb

@@ -0,0 +1,5 @@
+module Enjoy::Decorators
+  module PageBlockset
+    extend ActiveSupport::Concern
+  end
+end

data/app/models/enjoy/page_block.rb

@@ -4,6 +4,10 @@ module Enjoy
       include Enjoy::Models::PageBlock
 
       include Enjoy::Decorators::PageBlock
+
+      rails_admin(&Enjoy::Admin::PageBlock.config(rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
     end
   end
 end

data/app/models/enjoy/page_blockset.rb

@@ -4,6 +4,10 @@ module Enjoy
       include Enjoy::Models::PageBlockset
 
       include Enjoy::Decorators::PageBlockset
+
+      rails_admin(&Enjoy::Admin::PageBlockset.config(rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
     end
   end
 end

data/lib/enjoy/admin/page_block.rb

@@ -7,6 +7,7 @@ module Enjoy
 
           field :enabled, :toggle
           field :name
+          field :content, :enjoy_html
 
           fields.each_pair do |name, type|
             if type.nil?
@@ -20,18 +21,18 @@ module Enjoy
             end
           end
 
-          field :items do
-            read_only true
-            help 'Список блоков'
-
-            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
-          end
+          # field :blocksets do
+          #   read_only true
+          #   help 'Список групп блоков'
+          #
+          #   pretty_value do
+          #     bindings[:object].blocksets.to_a.map { |bs|
+          #       route = (bindings[:view] || bindings[:controller])
+          #       model_name = bs.rails_admin_model
+          #       route.link_to(bs.name, route.rails_admin.show_path(model_name: model_name, id: bs.id), title: bs.name)
+          #     }.join("<br>").html_safe
+          #   end
+          # end
 
           if block_given?
             yield self

data/lib/enjoy/admin/page_blockset.rb

@@ -8,6 +8,9 @@ module Enjoy
           field :enabled, :toggle
           field :name
 
+
+          field :blocks
+
           fields.each_pair do |name, type|
             if type.nil?
               field name
@@ -20,18 +23,18 @@ module Enjoy
             end
           end
 
-          field :items do
-            read_only true
-            help 'Список блоков'
-
-            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
-          end
+          # field :blocks do
+          #   read_only true
+          #   help 'Список блоков'
+          #
+          #   pretty_value do
+          #     bindings[:object].blocks.to_a.map { |b|
+          #       route = (bindings[:view] || bindings[:controller])
+          #       model_name = b.rails_admin_model
+          #       route.link_to(b.name, route.rails_admin.show_path(model_name: model_name, id: b.id), title: b.name)
+          #     }.join("<br>").html_safe
+          #   end
+          # end
 
           if block_given?
             yield self

data/lib/enjoy/configuration.rb

@@ -38,7 +38,7 @@ module Enjoy
     attr_accessor :routes_config
 
     def initialize
-      @news_image_convert_options {}
+      @news_image_convert_options = {}
       @news_image_styles = {
           main:  '400x200>',
           thumb: '200x100>'

data/lib/enjoy/models/mongoid/page_block.rb

@@ -7,6 +7,8 @@ module Enjoy
         include Enjoy::HtmlField
 
         included do
+          has_and_belongs_to_many :blocksets, inverse_of: :blocks, class_name: "Enjoy::PageBlockset"
+
           enjoy_cms_html_field :content, type: String, localize: Enjoy.config.localize, default: ""
         end
       end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.0.3"
+  VERSION = "0.3.0.4"
 end

data/lib/enjoy_cms.rb

@@ -76,6 +76,9 @@ module Enjoy
     autoload :EmbeddedGalleryImage, 'enjoy/admin/embedded_gallery_image'
     autoload :GalleryImage,         'enjoy/admin/gallery_image'
     autoload :Gallery,              'enjoy/admin/gallery'
+
+    autoload :PageBlock,            'enjoy/admin/page_block'
+    autoload :PageBlockset,         'enjoy/admin/page_blockset'
   end
 
   module Models
@@ -92,6 +95,9 @@ module Enjoy
     autoload :GalleryImage,         'enjoy/models/gallery_image'
     autoload :Gallery,              'enjoy/models/gallery'
 
+    autoload :PageBlock,             'enjoy/models/page_block'
+    autoload :PageBlockset,          'enjoy/models/page_blockset'
+
     module Mongoid
       autoload :SitemapData,  'enjoy/models/mongoid/sitemap_data'
       autoload :Seo,  'enjoy/models/mongoid/seo'
@@ -105,6 +111,9 @@ module Enjoy
       autoload :EmbeddedGalleryImage, 'enjoy/models/mongoid/embedded_gallery_image'
       autoload :GalleryImage,         'enjoy/models/mongoid/gallery_image'
       autoload :Gallery,              'enjoy/models/mongoid/gallery'
+
+      autoload :PageBlock,             'enjoy/models/mongoid/page_block'
+      autoload :PageBlockset,          'enjoy/models/mongoid/page_blockset'
     end
 
     module ActiveRecord

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.0.3
+  version: 0.3.0.4
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -483,6 +483,8 @@ files:
 - app/models/concerns/enjoy/decorators/menu.rb
 - app/models/concerns/enjoy/decorators/news.rb
 - app/models/concerns/enjoy/decorators/page.rb
+- app/models/concerns/enjoy/decorators/page_block.rb
+- app/models/concerns/enjoy/decorators/page_blockset.rb
 - app/models/concerns/enjoy/decorators/seo.rb
 - app/models/concerns/enjoy/decorators/sitemap_data.rb
 - app/models/concerns/enjoy/enableable.rb