tramway-event 1.9.27.1 → 1.9.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239e3ac28e3f32df2fa85cb6a245b42d482a353ba98ef1a4229820414f79681c
-  data.tar.gz: a5b78651c18e57179fa3777002c562b7e34df12e8ce50a7d576472f03cc7dd63
+  metadata.gz: 241c264a182d5ca87776f79cc40d2377b152cd8c518d881ecfa1bac2b9f85a50
+  data.tar.gz: 7e6c0ffa780c771a29310bc6a9e0a9266d7c324098c40a571c7f76874a438227
 SHA512:
-  metadata.gz: 2a68fc9b0b98670ea2c4f8afab3e53ea55cc45cf0ccba48085dce06285fd3bfd85a8d1a332c33021ec0bb9e8f3b7a67ca6a561a458725848bc43538ac677a204
-  data.tar.gz: 916d2f6349c945085ec32d6219f73c04d8080a87778d120572a1262815b2a6a46e4092cab6f5feef87019b8482f3151288558aef3f69098ce58d5fa1a2a8b786
+  metadata.gz: 8769df93fe84e0cbfc9214bc5a8b137027ad998918dafa0bb74f4834b0e365730e37f3973a9525934e309382854e3a0de7e4ffd0952985309d26cf2ae4d5d5be
+  data.tar.gz: eece803bfc35d6ab469df22309503ad4838247ec0669bc52e247eee9a5503bdd6ff06dc92731a93545db6c7560b70e9939848813af7c63ab3fc67794379a6da8

data/README.md

@@ -27,6 +27,13 @@ rails db:migrate
 
 #### 4. Then make `tramway-landing` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/README.md#installation)
 
+Versions table
+
+| tramway-event | tramway-landing |
+| ------------- | --------------- |
+| < 1.9.27.1 | 1.x |
+| >= 1.9.27.2 | 2.x | 
+
 #### 5. Add events to admin panel
 
 *config/initializers/tramway.rb*
@@ -41,6 +48,13 @@ Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::P
 mount Tramway::Event::Engine, at: '/'
 ```
 
+## How-to
+
+### Create event
+
+English docs coming soon...
+[На русском](https://github.com/ulmic/tramway-dev/tree/develop/tramway-event/docs/russian)
+
 ## Contributing
 Contribution directions go here.
 

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

@@ -44,7 +44,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
           object.event.title
         end)
       end)
-      object.event.participant_form_fields.map do |field|
+      object.event.participant_form_fields.active.map do |field|
         hash = if field.options.is_a?(Hash)
                  field.options
                else

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

@@ -11,8 +11,8 @@ class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
       ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(
         SecureRandom.hex,
         object.event,
+        participation_state_event: :default,
         comment: :string,
-        participation_state_event: :string
       ).new object
     else
       super(object).tap do |obj|

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

@@ -13,7 +13,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   enumerize :status, default: :common, in: %i[common main]
 
-  scope :main_event, -> { where(status: :main) }
+  scope :main_event, -> { active.where(status: :main) }
   scope :actual, -> { where 'end_date > ?', DateTime.now }
   scope :past, -> { where 'end_date < ?', DateTime.now }
 

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

@@ -1,7 +1,5 @@
 - content_for :title do
   = @event.title
-- content_for :head_content do
-  = javascript_include_tag 'tramway/event/application'
 - content_for :footer_links do
   %ul
     - @events.each do |event|

data/config/initializers/tramway.rb

@@ -11,3 +11,7 @@
 ::Tramway::Admin.set_notificable_queries new_participants: lambda { |current_user|
   ::Tramway::Event::Participant.active.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
 }
+
+::Tramway::Landing.head_content = lambda do
+  javascript_include_tag 'tramway/event/application'
+end

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.27.1'
+    VERSION = '1.9.27.6'
   end
 end

metadata

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