tramway-page 1.5.3.4 → 1.5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597d7b82b9a142d39de22114e710dcbda2df5f3854aef0d489bd3b5053b971fa
-  data.tar.gz: dc0d709e0cb0a326ec3dbd1a8c16f00c6c95f8ee53a4199034bf5106c3e7ddc9
+  metadata.gz: f54e0871574115ad5619fb16a4b4648f38379861dd54dcddc86e33de23cc8e83
+  data.tar.gz: 1d75e72402c883bd118dc421ede02f224ac44f5a1c997b1f16c4a2692f852b3e
 SHA512:
-  metadata.gz: 685464ba40427820743885e46636ad309305e5ecba419051f914475a905cd384829c76f2620a6418eb4ddb5e60760487d5ecfb52adf2f5feb8d9fc8f1c1d2b43
-  data.tar.gz: 9aefd9d322d53e253d8018d6d8bbb416eed6bac01aece0891ee9daa77f72ec25095f68591141c385d54bf4f289ae7f6d744fb87c057c57b917d1c136f5f74ecc
+  metadata.gz: 573e634a9584aff6f053d71ebe10f6f2142b727bc0adcac13036d1d88153449bb9ca9fbabf184cfe51256022a70052e72c9468d95b96488122be71f95b5585e7
+  data.tar.gz: 7f9f6a54822873972bda19e0a1d8e8039f086c901d5f2e86bce957f6a50f676bd7edf72e02c692be31f5b86f25f23616a2cd5204d2308be1e7daca7a0e5c64c6

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

@@ -4,7 +4,6 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
   layout 'tramway/landing/application'
 
   def show
-    @application = ::Tramway::Core.application_object # FIXME need to be in the Tramway::Core::ApplicationController
     @page = ::Tramway::Page::Page.published.find_by slug: params[:slug]
     @blocks = @page.blocks.published.active.map do |block|
       if block.block_type.header_with_form? && block.form_url.present?

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

@@ -8,16 +8,16 @@ class Tramway::Page::Page < ::Tramway::Core::ApplicationRecord
   scope :landings, -> { where page_type: :landing }
   scope :published, -> { where view_state: :published }
 
-  state_machine :view_state, initial: :unpublished do
-    state :unpublished
+  aasm :view_state, column: :view_state do
+    state :unpublished, initial: true
     state :published
 
     event :publish do
-      transition unpublished: :published
+      transitions from: :unpublished, to: :published
     end
 
     event :hide do
-      transition published: :unpublished
+      transitions from: :published, to: :unpublished
     end
   end
 end

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.4'
+    VERSION = '1.5.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.3.4
+  version: 1.5.4.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2021-03-22 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.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Summary of Tramway::Page.