tramway-event 1.9.27 → 1.9.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 254c506135da94272d3b29c64e8433408899887d076f9ddf90c500575fce39bc
-  data.tar.gz: ccf6e8f67d7305b19d57c262a7375d7f6cee0c7a22e8f38a2f9040ff67dceff5
+  metadata.gz: c249109b5116699d48174ff4b48b57d6d584fef2232f9a658285f2f893cec805
+  data.tar.gz: b295724487ae1f0a637aea4a7aa11b37c38037105cafdc044a43220bc2220557
 SHA512:
-  metadata.gz: 5511a2b01b04e1fcc82970f02eb620f94f3cdade6679841846400597b2647c6a61dde2fd5a3299b7da5e640d1c74bed105085dd48789efd87caee00c50a77d36
-  data.tar.gz: a5d4093e097bbf6c56a37e6151f7723ae4bf83d907f35313df0794208c2452038fa462ecb436ba5b7e3859546c0ba1e9d6137fc37d40a4949ca5f6a18285ceef
+  metadata.gz: 990511a6a9c9eade64d987c9d131d34164353e938e516512d3af1ae7e5da81c54ffa15f2f92b628ad2c72b986da9550a00510c6554f0bd6bd32d540d9a856d07
+  data.tar.gz: cf4c2a0ede66ef23017c4f1fbbe52d35cb5954490da5e96ac36fc7fa175c5dfa0309454289ed228141693b7803b096253457092066ab5b04ceda1b70d571edea

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/event_decorator.rb

@@ -74,8 +74,8 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   def events_link
     event_link = Tramway::Event::Engine.routes.url_helpers.event_path object
-    event_url = ['molodoy.online', event_link].join
-    content_tag(:div) do
+    event_url = ['http://molodoy.online', event_link].join
+    content_tag(:pre) do
       id = "event#{object.id}"
       concat link_to event_url, event_url, id: id
       concat copy_to_clipboard id

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/forms/tramway/event/participant_form_field_form.rb

@@ -18,6 +18,7 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplic
 
   def submit(params)
     super(params).tap do
+      model.options = {} if model.options == ''
       model.options&.merge! list_field: (params[:list_field] == '1').to_s
       model.save
     end

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'
+    VERSION = '1.9.27.5'
   end
 end

metadata

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