tramway-event 1.6.4 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c5fef82865b2a59a341fdd4b602e8bf461497dc68fffbf1f33425adc9f4144
-  data.tar.gz: 55605dafbd285e984dffaeef226a71fe5a6b1ad36a6a6313393ee90528bc26ad
+  metadata.gz: 37923a2a9773e2913ef0830b5d9f15bca800c1fecc90ac0a3347dbb45f759306
+  data.tar.gz: fc14669e2e6ae25608176ffbee418a68c6531e8f896157dfb4f6599991e6733a
 SHA512:
-  metadata.gz: 05d26eb2fb4eaaf2800dbe5e093b8d14ee283c7e73790dd64e8b0752d4015025953c8af91851caed73f32634db2e066edf28ea1f27c0c7a39b6d0a272e33339b
-  data.tar.gz: 128e495a8396c61c12f151d14d39f94e392f08f77b30fe165884e06eae42d4015dd1018536a256456ff3f6d57868042375fe6653528854f482bb39edcd914a90
+  metadata.gz: 5d7e2039ad6e6854cb2d4b1549348579b676bd0ff83689f8490b09cfd32a918a4ba6274795607879096c351c1458f41c64056dc48fad0f2b04549509001c940a
+  data.tar.gz: 7f0ff40f0e46d85ad589e0bd56edb11cc44e5017ee2ffd9959cca4e803d06f251650e72176c6a6a1beeff8edfb8420207147e6c1dbb5d5f123062b4b6423d42f

data/app/controllers/tramway/event/events_controller.rb

@@ -8,5 +8,6 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
     @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
     @events = ::Tramway::Event::Event.active.map { |e| ::Tramway::Event::EventDecorator.decorate e }
+    @people_as_features = @event.partakings.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
   end
 end

data/app/decorators/tramway/event/event_decorator.rb

@@ -9,6 +9,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   delegate :description, to: :object
   delegate :participant_form_fields, to: :object
   delegate :sections, to: :object
+  delegate :partakings, to: :object
   decorate_association :participants
 
   def background

data/app/forms/tramway/event/partaking_form.rb

@@ -1,10 +1,10 @@
 class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
-  properties :section_id, :person_id, :position
-  associations :section, :person
+  properties :part_id, :part_type, :person_id, :position
+  associations :person, :part
 
   def initialize(object)
     super(object).tap do
-      form_properties section: :association,
+      form_properties part: :polymorphic_association,
         person: :association,
         position: :string
     end

data/app/models/tramway/event/event.rb

@@ -4,6 +4,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :participants, class_name: 'Tramway::Event::Participant'
   has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
   has_many :sections, class_name: 'Tramway::Event::Section'
+  has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
 
   enumerize :status, default: :common, in: [ :common, :main ]
 

data/app/models/tramway/event/partaking.rb

@@ -1,4 +1,6 @@
 class Tramway::Event::Partaking < ::Tramway::Core::ApplicationRecord
-  belongs_to :section, class_name: 'Tramway::Event::Section'
+  belongs_to :part, polymorphic: true
+  enumerize :part_type, in: [ 'Tramway::Event::Event', 'Tramway::Event::Section' ]
+
   belongs_to :person, class_name: 'Tramway::Event::Person'
 end

data/app/models/tramway/event/section.rb

@@ -2,5 +2,5 @@ class Tramway::Event::Section < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
   belongs_to :event, class_name: 'Tramway::Event::Event'
-  has_many :partakings, class_name: 'Tramway::Event::Partaking'
+  has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
 end

data/app/views/tramway/event/events/_show_page.html.haml

@@ -40,3 +40,4 @@
       = render 'tramway/event/sections/show_page', section: section
       - if index < sections.count - 1
         %br
+    = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Оргкомитет", description: "", anchor: :organizers), collection: people_as_features, options: { image: { css: { class_name: 'circle' } } }

data/app/views/tramway/event/events/show.html.haml

@@ -6,5 +6,5 @@
       %li
         = link_to event.title, event_path(event.id)
 - content_for :body_content do
-  = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features
+  = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features, people_as_features: @people_as_features
   = render "tramway/landing/blocks/block_types/footer", block: @footer

data/config/locales/models.yml

@@ -16,6 +16,13 @@ ru:
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие
+      tramway/event/section:
+        title: Название
+        description: Описание
+        event: Мероприятие
+        photo: Изображение
+        icon: Иконка
+        position: Позиция на странице мероприятия
   cases:
     tramway/event/event:
       plural: мероприятия

data/lib/tramway/event/generators/install_generator.rb

@@ -34,7 +34,10 @@ module Tramway::Event::Generators
 
         :add_position_to_tramway_event_partakings,
         :add_state_to_tramway_event_partakings,
-        :add_more_fields_to_tramway_event_participants
+        :add_more_fields_to_tramway_event_participants,
+        
+        # NOTE must be removed until tramway-event 2.0
+        :rebuild_association_between_participant_and_partakings_to_polymorphic
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/event/generators/templates/rebuild_association_between_participant_and_partakings_to_polymorphic.rb

@@ -0,0 +1,8 @@
+# NOTE must be removed until tramway-event 2.0
+
+class RebuildAssociationBetweenParticipantAndPartakingsToPolymorphic < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :tramway_event_partakings, :section_id, :part_id
+    add_column :tramway_event_partakings, :part_type, :text, default: 'Tramway::Event::Section'
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.6.4'
+    VERSION = '1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: '1.7'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -82,6 +82,7 @@ files:
 - lib/tramway/event/generators/templates/create_tramway_event_people.rb
 - lib/tramway/event/generators/templates/create_tramway_event_people_sections.rb
 - lib/tramway/event/generators/templates/create_tramway_event_sections.rb
+- lib/tramway/event/generators/templates/rebuild_association_between_participant_and_partakings_to_polymorphic.rb
 - lib/tramway/event/generators/templates/rename_tramway_event_people_sections_to_tramway_event_partakings.rb
 - lib/tramway/event/version.rb
 homepage: https://github.com/ulmic/tramway-event