tramway-landing 1.1.3.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d585d8617d8ba48440a0d584291a8de5955e697a99694171c3443f00d475c219
-  data.tar.gz: a7f0f89676041bc4d83f0dd99b1e329282e0d58b11dcc9c2ef8d796daeca592b
+  metadata.gz: 0d515000601a6fbf5765462de251923e05efcf9d2b66c55d087d39c1f40cddd9
+  data.tar.gz: 0b9661262483cd06592d77555fce0b48a5b25ad69ac1d8fa4b73420c77758537
 SHA512:
-  metadata.gz: cddd27cf802f23914b6145c91d366747115e2e6ffa93ac6375aabc7930d6c335edd4cb8413b90dc4fc29e4d8e5994c9098b5a90feee8a14523b32b43006557b3
-  data.tar.gz: afae0737e44856838f2c79b8acd768f557a5f776605a55e941e082dc6b558b984dafc4192efe44b68e66965de0f8c52dc166dca06bd894686998a51ae1512952
+  metadata.gz: 568c7bae60fc18a99dd7211d4932398b5a73f65308f7a83e1414f5389df2c325f7f5721b6aa4aa109cd024b444dba2ed5a80e71228b26123bdd87fe6969785d4
+  data.tar.gz: c3aa28335296e92eff35d9b6530f3982c8138e6dd4970daae82540c26a73974ef2461ec2f9ea4dad7a590e626ef70cfdec46bc53f6489608c7f846df4043b230

data/app/forms/tramway/landing/block_form.rb

@@ -1,5 +1,5 @@
 class Tramway::Landing::BlockForm < ::Tramway::Core::ApplicationForm
-  properties :title, :background, :view_state, :block_type, :position, :navbar_link, :anchor, :description
+  properties :title, :background, :view_state, :block_type, :position, :navbar_link, :anchor, :description, :link_object_type, :link_object_id
 
   def initialize(object)
     form_object = super object
@@ -9,7 +9,9 @@ class Tramway::Landing::BlockForm < ::Tramway::Core::ApplicationForm
                     block_type: :default,
                     navbar_link: :default,
                     anchor: :string,
-                    description: :default
+                    description: :default,
+                    link_object_type: :default,
+                    link_object_id: :numeric
     form_object
   end
 end

data/app/models/tramway/landing/block.rb

@@ -1,6 +1,9 @@
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
-  enumerize :block_type, in: [ :header, :footer, :page, :cards, :features, :contacts, :news ]
+  belongs_to :link_object, polymorphic: true
+
+  enumerize :block_type, in: [ :header, :footer, :page, :cards, :features, :contacts, :news, :link ]
   enumerize :navbar_link, in: [ :exist, :not_exist ], default: :not_exist
+  enumerize :link_object_type, in: [ 'Tramway::SportSchool::Document' ]
 
   mount_uploader :background, PhotoUploader
 

data/app/views/tramway/landing/blocks/block_types/_link.html.haml

@@ -0,0 +1,9 @@
+.row{ id: block.anchor }
+  .col-md-7
+    - decorated_link_object = "#{block.link_object_type.camelize}Decorator".constantize.new(block.link_object)
+    = link_to  decorated_link_object.link do
+      = fa_icon :download
+      = decorated_link_object.name
+  .col-md-5
+    %p
+      = block.description

data/config/locales/models.yml

@@ -12,6 +12,8 @@ ru:
         navbar_link: Ссылка в навигационной панели
         anchor: Якорь (ссылка в строке URL)
         description: Описание
+        link_object_type: Тип объекта, на который делается ссылка
+        link_object_id: ID объекта, на который делается ссылка
   cases:
     tramway/landing/block:
       plural: Блоки
@@ -26,6 +28,7 @@ ru:
         features: "Список возможностей (выделяет возможности): Программируется"
         contacts: Блок с контактами
         news: Блок новостей
+        link: Ссылка на объект
       navbar_link:
         exist: Присутствует
         not_exist: Отсутствует

data/lib/tramway/landing/generates/install_generator.rb

@@ -16,6 +16,8 @@ module Tramway::Landing::Generators
       migration_template 'add_navbar_link_to_tramway_landing_blocks.rb', 'db/migrate/add_navbar_link_to_tramway_landing_blocks.rb'
       migration_template 'add_anchor_to_tramway_landing_blocks.rb', 'db/migrate/add_anchor_to_tramway_landing_blocks.rb'
       migration_template 'add_description_to_tramway_landing_blocks.rb', 'db/migrate/add_description_to_tramway_landing_blocks.rb'
+      migration_template 'add_link_object_id_to_tramway_landing_blocks.rb', 'db/migrate/add_link_object_id_to_tramway_landing_blocks.rb'
+      migration_template 'add_link_object_type_to_tramway_landing_blocks.rb', 'db/migrate/add_link_object_type_to_tramway_landing_blocks.rb'
     end
   end
 end

data/lib/tramway/landing/generates/templates/add_link_object_id_to_tramway_landing_blocks.rb

@@ -0,0 +1,5 @@
+class AddLinkObjectIdToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :link_object_id, :integer
+  end
+end

data/lib/tramway/landing/generates/templates/add_link_object_type_to_tramway_landing_blocks.rb

@@ -0,0 +1,5 @@
+class AddLinkObjectTypeToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :link_object_type, :text
+  end
+end

data/lib/tramway/landing/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Landing
-    VERSION = '1.1.3.1'
+    VERSION = '1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.1.3.1
+  version: '1.2'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -46,6 +46,7 @@ files:
 - app/views/tramway/landing/blocks/block_types/_features.html.haml
 - app/views/tramway/landing/blocks/block_types/_footer.html.haml
 - app/views/tramway/landing/blocks/block_types/_header.html.haml
+- app/views/tramway/landing/blocks/block_types/_link.html.haml
 - app/views/tramway/landing/blocks/block_types/_page.html.haml
 - config/initializers/assets.rb
 - config/initializers/tramway.rb
@@ -58,6 +59,8 @@ files:
 - lib/tramway/landing/generates/install_generator.rb
 - lib/tramway/landing/generates/templates/add_anchor_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_description_to_tramway_landing_blocks.rb
+- lib/tramway/landing/generates/templates/add_link_object_id_to_tramway_landing_blocks.rb
+- lib/tramway/landing/generates/templates/add_link_object_type_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_navbar_link_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/create_tramway_landing_blocks.rb
 - lib/tramway/landing/version.rb