tramway-page 1.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1965d93d821932f6bfd8722be71212d2eecad82f8b7d10a23a35f92f214065c
-  data.tar.gz: 41a9bbe1bb5742dd464239e05a0141db8104844db9dfb912fff715846a73cca9
+  metadata.gz: d1cbea56bbf0d6591b925fe452014620ff8b7d86455513594c6b8f05bce3979e
+  data.tar.gz: 6d211b20569f271b391f895adad6989d14913eccafc56ec1abd5e9e2d922cdf6
 SHA512:
-  metadata.gz: 077a64fe57736ce4211b1d862f51efe5aa13be68c51780775f06ee029cdeab71bf8e9452626d4586e15aa8c2671e0764dfe5ba92cd4685e9fa3354dcf3929253
-  data.tar.gz: 84470d8efb6e415e9cc2baf9824206274405786edc36a974d9a1a73fd2f612880e8c7035739c83f65d61c196dde4c5f1e754bbd75854fbe12cb0bfab10250a8b
+  metadata.gz: d8b2e229afc065d945fe9ca9e47e87345b4c34e54a2ed09096db1b99004dff7bb40f33b815b52c052900362d692fe69e78d8f7d8cd557440cc62033aa45d24f6
+  data.tar.gz: 41d82c1b5a68039374ef17b5752fad5ce51d03d9a5949f32282ece73a1f50e716abc6eb6ff5d68a1dbc68cf70df66888f4abace63fc9e1b8d6a8868741f90c53

data/app/controllers/tramway/page/pages_controller.rb

@@ -5,6 +5,12 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
 
   def show
     @page = ::Tramway::Page::Page.find_by slug: params[:slug]
-    @blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.active.where('values @> ?', { page: @page.id.to_s }.to_json)
+    @blocks = @page.blocks.active.map do |block|
+      if block.block_type.header_with_form? && block.form_url.present?
+        # FIXME in future
+        @header_with_form = block.form_to_render.new(Tramway::Auth.authenticable_models.first.new)
+      end
+      ::Tramway::Landing::BlockDecorator.decorate block
+    end
   end
 end

data/app/decorators/tramway/page/page_decorator.rb

@@ -5,10 +5,16 @@ class Tramway::Page::PageDecorator < ::Tramway::Core::ApplicationDecorator
     def collections
       [:all]
     end
+
+    def show_associations
+      [ :blocks ]
+    end
   end
 
   delegate :title, to: :object
 
+  decorate_association :blocks, state_machines: [ :view_state ]
+
   def lead
     object.body.first 200
   end

data/app/forms/admin/tramway/page/page_form.rb

@@ -9,7 +9,7 @@ class Admin::Tramway::Page::PageForm < ::Tramway::Core::ApplicationForm
                       page_type: {
                         type: :default,
                         input_options: {
-                          hint: "Body and View fields will be ignored in Landing page type. You will configurate it with Blocks"
+                          hint: "View field will be ignored in Landing page type. You will configurate it with Blocks"
                         }
                       },
                       body: :ckeditor,

data/app/models/tramway/page/page.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class Tramway::Page::Page < ::Tramway::Core::ApplicationRecord
-  enumerize :page_type, in: [ :custom, :landing ], default: :custom
+  has_many :blocks, class_name: 'Tramway::Landing::Block'
+
+  enumerize :page_type, in: [ :main, :other ], default: :other
 
   scope :landings, -> { where page_type: :landing }
 end

data/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.4'
+    VERSION = '1.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies: []
 description: Description of Tramway::Page.
 email: