tramway-event 1.12.6.2 → 1.12.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7a13d81c0f6f396312c7401c34089bf766812f530121a7bf525cd8aaa557bb
-  data.tar.gz: f82e08ce10379a04c28a3b80cdd26408c21f8314ba29a7dc69544e55001fde12
+  metadata.gz: ed98922babffdc1a3de30a4ba9fdaa0a7ee7d27a8ca99e6410f6a78efa69acac
+  data.tar.gz: 9e4a42ece100b7438e90e91a4f0173d111ca04acbe269206432bc2402d6d90ae
 SHA512:
-  metadata.gz: c9e2b4dd803318ab7db79ce025d62ed8066ab41726f5710dea281bd1fb9586536991efeb3b4ce95364766b57a37e7dfa5025afdfa4b24401cf10b041e6d21e11
-  data.tar.gz: 219d971dbe76967a917c36891b3be59bb05c3547598a0d62051f0fecd518b84862f37103d01dbee885cf955deecba2f9ea673b76f5009a207cd376b54b7e5694
+  metadata.gz: adeb3d5a0efceb9e0d6d3c764cd1445c266aa7049337bd872886c2e07f215eb4a3eb406ee139c091ead1406d42062c7e50662162aa9ee9e7fb04d7ce1b94436e
+  data.tar.gz: 320a9180d27c0c5b874ac69a4dc0a8f28aca96d66d6d9715535af4669253b638284e7bc2aad53326dde91a89d90e946fcbc0e808eeb973d36e32b10a0f856ca4

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

@@ -7,14 +7,14 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     event = ::Tramway::Event::Event.find params[:id]
     @event = ::Tramway::Event::Events::Show::EventDecorator.decorate event
     @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
-    @sections_as_features = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
-    @sections = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
+    @sections_as_features = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
+    @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
     @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 }
+    @events = ::Tramway::Event::Event.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
+    @people_as_features = @event.partakings.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
     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|
+        hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).map do |partner|
           Tramway::Partner::OrganizationFeatureDecorator.decorate partner
         end)
       end

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

@@ -77,7 +77,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def requested_participants
-    object.participants.active.count
+    object.participants.count
   end
 
   def approved_participants

data/app/decorators/tramway/event/events/show/event_decorator.rb

@@ -34,7 +34,7 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   def partners
     if defined?(::Tramway::Partner)
       @partners ||= ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-        hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).active.map do |partner|
+        hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).map do |partner|
           Tramway::Partner::OrganizationFeatureDecorator.decorate partner
         end)
       end

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.active.map do |field|
+      object.event.participant_form_fields.map do |field|
         hash = if field.options.is_a?(Hash)
                  field.options
                else

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

@@ -20,7 +20,7 @@ class Tramway::Event::ParticipantXlsDecorator < Tramway::Export::Xls::Applicatio
   end
 
   def flexible_columns
-    object.event.participant_form_fields.active.order(position: :asc).map(&:title).map do |key|
+    object.event.participant_form_fields.order(position: :asc).map(&:title).map do |key|
       { Tramway::Event::Participant.human_attribute_name(key).to_sym => -> { values&.dig(key) } }
     end
   end

data/config/initializers/tramway.rb

@@ -10,7 +10,7 @@
   ::Tramway::Event::Action,
   project: :event)
 ::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::Event::Participant.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
 }
 
 ::Tramway::Landing.head_content = lambda do

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.6.2'
+    VERSION = '1.12.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.6.2
+  version: 1.12.6.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Rails engine for events