tramway-event 1.9.19.6 → 1.9.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ef78204cd4ee382b3d6fe1f2ea0aee9a6a73dfa20763b7d7315b035dd66840
-  data.tar.gz: 0f809850f6a465cc37bd40aea40ead15e884c5c6cbb1d0bc0c0010859bcce088
+  metadata.gz: ed1b88e09e03ede03bb8a2b8ab1c10c596bae453b37e2ffd3070ded3051dee77
+  data.tar.gz: 1dad8b0361b17e033a6c20773179e4c02d72599bf9b41cecee22b5fd96d87b2a
 SHA512:
-  metadata.gz: e79568865d3c6cf054cde85248c3807da326d38fb64b1ca8428276bec75dc3f68821fac6dc8e9a07529caa36f5aa35f2662ec57ac591c33bbffd3278bf46d645
-  data.tar.gz: 3f19ed519d3052c77806f16412ca89400b12db5285d496bb23d0b9ae7cd642ac2fc492b0b07139fd91f1b17804b5342e0110ae093ad438a9d5130609538387cd
+  metadata.gz: 2e717a1a19ee8148036002357a6f2c287664c55fa26b9148a9583c271e75f4e3584aa1087a13c79f638a5b3d8e5c2fd92832ffcd2b5a30ee0e1ed444c9c22de8
+  data.tar.gz: 4d07c12107eaecb01cea6bb87c3b811c330bf22df576e5cb4909325d333e091e30d609b43b16591db90baf6f76d72439919a010dc030027074bde54caba2f946

data/README.md

@@ -5,7 +5,8 @@ Short description and motivation.
 How to use my plugin.
 
 ## Installation
-Add this line to your application's Gemfile:
+
+#### 1. Add this line to your application's Gemfile:
 
 ```ruby
 gem 'tramway-event'
@@ -13,28 +14,33 @@ gem 'carrierwave'
 gem 'more_html_tags'
 ```
 
-And then execute:
+#### 2. And then execute:
 ```bash
 $ bundle
 ```
-*Gemfile*
-```ruby
-gem 'tramway-event'
-```
 
-Then run:
+#### 3. Then run:
 ```shell
 rails g tramway:event:install
 rails db:migrate
 ```
 
-Then make `tramway-landing` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/README.md#installation)
+#### 4. Then make `tramway-landing` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/README.md#installation)
+
+#### 5. Add events to admin panel
 
 *config/initializers/tramway.rb*
 ```ruby
 Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::ParticipantFormField, ::Tramway::Event::Participant, project: #{project_which_you_used_in_the_application}
 ```
 
+#### 6. Add events routes to the app
+
+*config/routes.rb*
+```ruby
+mount Tramway::Event::Engine, at: '/'
+```
+
 ## Contributing
 Contribution directions go here.
 

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

@@ -12,10 +12,12 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
     @events = ::Tramway::Event::Event.active.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
     @people_as_features = @event.partakings.active.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
-    @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-      hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).active.map do |partner|
-        Tramway::Partner::OrganizationFeatureDecorator.decorate partner
-      end)
+    if defined?(::Tramway::Partner)
+      @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
+        hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).active.map do |partner|
+          Tramway::Partner::OrganizationFeatureDecorator.decorate partner
+        end)
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreato
   def self.create_form_class(uuid, event, **simple_properties)
     class_name = "ParticipantExtendedForm#{uuid.gsub('-', '')}"
     properties = event.participant_form_fields.inputs_list.reduce({}) do |hash, field|
-      hash.merge! field.title.to_sym => { object: field, validates: field.options['validations'] }
+      hash.merge! field.title.to_sym => { object: field, validates: field.options&.dig('validations') }
     end
     if simple_properties.keys.any?
       ::Tramway::Core::ExtendableForm.new(class_name, simple_properties: simple_properties, **properties)

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

@@ -5,14 +5,14 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationFor
   association :event
 
   def initialize(object)
-    form_object = super object
-    form_properties event: :association,
-                    title: :string,
-                    description: :string,
-                    field_type: :default,
-                    options: :text,
-                    position: :numeric
-    form_object
+    super(object).tap do
+      form_properties event: :association,
+        title: :string,
+        description: :string,
+        field_type: :default,
+        options: :text,
+        position: :numeric
+    end
   end
 
   def options

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

@@ -39,5 +39,6 @@
       - 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' } } }
-    - ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
-      = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: t("enumerize.tramway/partner/partnership.partnership_type.#{partnership_type}")), collection: partners[partnership_type]
+    - if defined? ::Tramway::Partner
+      - ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
+        = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: t("enumerize.tramway/partner/partnership.partnership_type.#{partnership_type}")), collection: partners[partnership_type]

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.19.6'
+    VERSION = '1.9.19.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.19.6
+  version: 1.9.19.7
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: