tramway-event 1.12.3.4 → 1.12.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c1ada06651814637cc6554ec7c936bed5bcac349aa69aa9c93df3748088e311
-  data.tar.gz: '008bd950893f2d754a5331a5dd41ba2e50f4c2ffd4f7e3e5e9924e1caa536afb'
+  metadata.gz: d16cb62030954f34b751e718ea4c6d9e6f674a9a5f819f2f77c72352e23a5522
+  data.tar.gz: 3fce7c42f43263082bf4076dd5e0a4eaadbe252e1be83d481611e765b4276ab1
 SHA512:
-  metadata.gz: 90a7c1ce458054d2b8693caa160f4a2f339687f4b07d82de0b23908610ab53b55701fcf67e0697e083cd3dbf252e70bdeb5146fa7fa25c0b3a0e54a30766e6c7
-  data.tar.gz: 41ea934bf3dd57d87c18ba3a579a77ab341d265784710cbe65f228d98a4543d7ac250497e9376cf9620ff8b308067cdbe59bd906b8e07c14238891061cecb82f
+  metadata.gz: be1c3f5817c1920b5d455d0ba2d6b583d79fc0edd29d80d738c053df40cb474916f08a9075ab0d1ab11b1da5a8ef50c3103a8213eb6b6a20ecf0cf166c7b8849
+  data.tar.gz: 8954b357e87e8035a1b6722696529993b52531088a74a42f160d190b7db78f2b94b2a1df811d07192462f0b98e1119590b19f660da1d1851f023258cb7674fbd

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

@@ -10,6 +10,10 @@ class Tramway::Event::ActionDecorator < Tramway::Core::ApplicationDecorator
     "#{object.title} - #{date_view(object.deadline)} - #{state_machine_view(object, :action_state)}"
   end
 
+  def title
+    object.title
+  end
+
   def action_state_button_color(event)
     case event
     when :do

data/app/helpers/tramway/event/application_helper.rb

@@ -8,6 +8,7 @@ module Tramway
       include ::FontAwesome5::Rails::IconHelper
       include ::Tramway::Collections::Helper
       include ::Tramway::Profiles::LinksHelper
+      include ::Tramway::Landing::ApplicationHelper
     end
   end
 end

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

@@ -7,12 +7,12 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   def check_dimensions
     if photo.present?
-      errors.add :photo, :too_small_image if photo.width < 1920 || photo.height < 1080
+      errors.add :photo, :too_small_image if photo.width.present? && (photo.width < 1920 || photo.height < 1080)
     end
   end
 
   has_many :participants, class_name: 'Tramway::Event::Participant'
-  has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
+  has_many :participant_form_fields, -> { order(position: :asc) }, class_name: 'Tramway::Event::ParticipantFormField'
   has_many :sections, class_name: 'Tramway::Event::Section'
   has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
   has_many :partnerships, class_name: 'Tramway::Partner::Partnership', as: :partner
@@ -22,7 +22,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   enumerize :reach, default: :open, in: %i[open closed]
 
-  scope :actual, -> { order(:begin_date).where('end_date > ?', DateTime.now) }
+  scope :actual, -> { where('begin_date > ?', DateTime.now).where('begin_date < ?', DateTime.now + 11.days).order(begin_date: :asc) }
   scope :past, -> { where 'end_date < ?', DateTime.now }
   scope :open, -> { where reach: :open }
   scope :closed, -> { where reach: :closed }

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.3.4'
+    VERSION = '1.12.3.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.3.4
+  version: 1.12.3.9
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus