tramway-page 1.5.3.7 → 1.5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321e16f700c986746dc15075982d8d20c7891e8915414cd1c6ed0a29df563cd1
-  data.tar.gz: f01934a365535a26921532b9e67427bdb59b6c3e6db473cf101a94878d1bcfe6
+  metadata.gz: f487df54faccc19946d7ee8be17f1ff1c93af30b2280b78e93395376cdaa4fc9
+  data.tar.gz: be7998669fac8f6aa1624c0c4e98a8e534eef2a9b1588a0d22a995dfffca650d
 SHA512:
-  metadata.gz: a39c3d6b929283fd481ce751e83b0be927d178c08b50557a59d67632109105683bf720b3630e87ef55615053ae8b89e0fec3fe898243819997b1e5501e420cd0
-  data.tar.gz: 6ef1aa36e66a4ecd81de3ffdbc98dd16ef17aa631815e1842f9bd6820216cf133729a32096852affc76f511dee4e490ef1eb7bdba817adbe027602910fcb4344
+  metadata.gz: 6c8c196704649ad27b3a323c0a32e9088824abb3d9baea9fb77b6de2dc53efa51915a4d3418adc6f4d55a61745ab5c02a254bf9e79c8e952f648c198e4f15e79
+  data.tar.gz: 579fee668c314266c8c81cdb5302218e0a22d1d3b3a5125d4ce30c96cab49bebb9ecad127fe8baa4a49805ce303fc78da28f18694d09f45b6e6778854e731a05

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)

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/decorators/tramway/page/page_decorator.rb

@@ -9,9 +9,23 @@ class Tramway::Page::PageDecorator < ::Tramway::Core::ApplicationDecorator
     def show_associations
       [:blocks]
     end
+
     delegate :human_view_state_event_name, to: :model_class
   end
 
+  def additional_buttons
+    {
+      show: [
+        { 
+          url: Tramway::Page::Engine.routes.url_helpers.preview_path(id: object.id),
+          method: :get,
+          text: 'Preview',
+          color: :primary
+        }
+      ]
+    }
+  end
+
   delegate_attributes :title, :page_type, :body
 
   decorate_association :blocks, state_machines: [:view_state]

data/app/views/tramway/page/shared/_main_page_view.html.haml

@@ -1,4 +1,8 @@
 - if @page.view.present?
+  :css
+    nav.navbar {
+      display: none;
+    }
   = render "tramway/page/pages/views/#{@page.view}"
 - else
   - content_for :title do

data/config/initializers/tramway.rb

@@ -1,20 +1,3 @@
 # frozen_string_literal: true
 
 ::Tramway::Admin.set_available_models(::Tramway::Page::Page, project: :page)
-::Tramway::Admin.set_additional_buttons(
-  {
-    ::Tramway::Page::Page => {
-      show: [
-        lambda { |record|
-          {
-            url: Tramway::Page::Engine.routes.url_helpers.preview_path(id: record.id),
-            method: :get,
-            text: 'Preview',
-            color: :primary
-          }
-        }
-      ]
-    }
-  },
-  project: :subberz
-)

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.3.7'
+    VERSION = '1.5.4.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.3.7
+  version: 1.5.4.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-12-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.0.3.1
 signing_key: 
 specification_version: 4
 summary: Summary of Tramway::Page.