tramway-event 1.12.3.3 → 1.12.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fe1c026aa84eda06dc4c6a326a2bb5113a91f5fde33d8f8387fd8018947988
-  data.tar.gz: 6f9f652a73d7b168552023bce0f8db8d0da98a69e2049784eeddd4cee2784f8e
+  metadata.gz: 9c19a417bee52053352aba5e12c1b4e7021111e3be20ec3fccab8b3587ea476e
+  data.tar.gz: ef7320eed1ed631cfc09491b165059c6d0b60731342735186ada038d29ad8f31
 SHA512:
-  metadata.gz: 1bd859ffb88da11d2ad32c85fb5486031b7582c850e90a3d5501c2f8ffe750489d7948693bfdd041f188d1c139f7482de774f38fa5c5ccaae8356325d18bd886
-  data.tar.gz: c8296778255d09a4ceccee0baaf3b9334fde443af14956263b47ccd647e08bc6482961f8c8f2410837229910abcc3822fefa345ce8eb671e7d93c14a15b5276c
+  metadata.gz: dbfc98616a01483ecdf222ccb20b9d6d36262e9920e21c2ddc5fdc1a80951c229864ec2640248644d96971f8c6b822f9ddf613bd5c7f514742e8c9ca4997a4b9
+  data.tar.gz: c7d0d7b0e767576552dd437f5319f8eea93def57b4b74e6576ab6cbf66cb1fb82accd764da8bcea2bd7743a4201cd6e1c082e3f9322b254f7f2a6ed8510708a5

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/decorators/tramway/event/event_link_decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::EventLinkDecorator < ::Tramway::Landing::LinkDecorator
+class Tramway::Event::EventLinkDecorator < ::Tramway::Landing::Navbar::LinkDecorator
   delegate :title, to: :object
 
   def link

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 + 2.days) }
   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.3'
+    VERSION = '1.12.3.8'
   end
 end

metadata

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