tramway-page 1.5.4.1 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8235104f968f686a83092e13ffd8dbd2d1915a8b9c9c5c2ba593d80fdcca3e50
-  data.tar.gz: 16b8368fd4d8ac1d36030a19dccf060e5ca0236fd3d72458794b184cb1cb3e79
+  metadata.gz: 69c0b46625403a5637e0845bab960d97e7ba812e421589448b8c7b60ad182029
+  data.tar.gz: 58e8d2cf3937bc7f7b663795f443c57c1a777afd425fc215ab3cf5b86a413e04
 SHA512:
-  metadata.gz: 0f0a1de0389159f3d8190ad6e09a2f4fda9da97ad78cbcc4625034fb0d5913baece01d30493e87d34e2aa69c52471a7b0d930f6fa9a946bfa24d873ec505842a
-  data.tar.gz: 71b1f13b592cea0bfbf20018cf8469febe2ff82a3dd8b6bd4105009791055356b36f56eb175b1eaf6882e2fc5eb37b9622249c61a29dfd3aa8c7179706f2637c
+  metadata.gz: 060a17f1e341a7f9465a4752660de4f8a86afac717872c85023e270c01db82cbdbc4a39ef0aed8e4199c3fb6b00698f32b8f01ae733dbf19416c9fc333b9447f
+  data.tar.gz: b6c5f5645240c2e645baf913bf048e3793b94b4bbebccae59201103cea70f85b0b934bca8102a012039056226fca99ad3e51a6771c0db2e41b3d4b613c280570

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

@@ -5,7 +5,7 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
 
   def show
     @page = ::Tramway::Page::Page.published.find_by slug: params[:slug]
-    @blocks = @page.blocks.published.active.map do |block|
+    @blocks = @page.blocks.published.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, page: @page.id)
@@ -15,5 +15,6 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
       end
       ::Tramway::Landing::BlockDecorator.decorate block
     end
+    render(layout: false) if @page.page_type.without_layout?
   end
 end

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

@@ -8,7 +8,7 @@ class ::Tramway::Page::PreviewsController < ::Tramway::Page::ApplicationControll
 
   def show
     @page = ::Tramway::Page::Page.find params[:id]
-    @blocks = @page.blocks.active.map do |block|
+    @blocks = @page.blocks.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, page: @page.id)

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

@@ -3,7 +3,7 @@
 class Tramway::Page::Page < ::Tramway::Core::ApplicationRecord
   has_many :blocks, -> { order(position: :asc) }, class_name: 'Tramway::Landing::Block'
 
-  enumerize :page_type, in: %i[main other], default: :other
+  enumerize :page_type, in: %i[main other without_layout], default: :other
 
   scope :landings, -> { where page_type: :landing }
   scope :published, -> { where view_state: :published }

data/config/locales/ru.state_machines.yml

@@ -1,11 +1,10 @@
 ru:
-  activerecord:
-    state_machines:
-      tramway/page/page:
-        view_state:
-          states:
-            published: Видена
-            unpublished: Скрыта
-          events:
-            publish: Показать на сайте
-            hide: Скрыть с сайта
+  state_machines:
+    tramway/page/page:
+      view_state:
+        states:
+          published: Видена
+          unpublished: Скрыта
+        events:
+          publish: Показать на сайте
+          hide: Скрыть с сайта

data/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.5.4.1'
+    VERSION = '1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.4.1
+  version: '1.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Description of Tramway::Page.
 email:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Summary of Tramway::Page.