tramway-event 1.9.19.2 → 1.9.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa39c1639004038330bc20e061dde1b2737ebdd6e8029c6d067fa675d2112cc
-  data.tar.gz: dc24aa87fdc2346c96a34d98a38f0bb4569e94ad6805be93271e6a6fe789f0df
+  metadata.gz: 9fd848d4774d69285cfa3c357b36834c18954c2b799e9e671184eaf833716f4f
+  data.tar.gz: 43275c678bf421112bafea09343a92ef4002815f962387fc72bc25da3750b8dc
 SHA512:
-  metadata.gz: 8809bdb33077e8dc9aded16ccfc98d8c894f5f1d0823802f7b211fdbd6ae352d218ba18d9a1200e6ca8706e3912dbac1c2a81b93cca75ae0e9c57a84aec61c49
-  data.tar.gz: e48bc4b4a56bfb11da3963564a59812854b35006ad70b762185c3749c9b64fffd0418c223e2e28ce620bf8123d384e04a1bda9c58329db1a3f735a95558df743
+  metadata.gz: 23f2a8c610c491f4bce5f1cd75e9cd9f7de29073d8bff369470003f9b54693b8ed0af2392eeb044bcad05fc4136e90555471a3b9fbd4b36e018a58d3c0446367
+  data.tar.gz: d3bef7ce5d1d5b5baedd3631152f7f8bea340a25bc9ca258924d58c76d791a516dc4c25b39d823a1750605d104f726469019c1e8de2c938d03058d09f06648dc

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

@@ -76,10 +76,14 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def approved_participants
-    if DateTime.now < object.end_date
-      I18n.t('activerecord.attributes.tramway/event/event.not_yet_held')
+    if object.end_date.present?
+      if DateTime.now < object.end_date
+        I18n.t('activerecord.attributes.tramway/event/event.not_yet_held')
+      else
+        object.participants.approved.count
+      end
     else
-      object.participants.approved.count
+      I18n.t('activerecord.attributes.tramway/event/event.does_not_have_end_date')
     end
   end
 

data/config/locales/models.yml

@@ -25,6 +25,7 @@ ru:
         approved_participants: Количество пришедших
         not_yet_held: мероприятие ещё не проведено
         participants_list: Список участников
+        does_not_have_end_date: мероприятие не имеет даты окончания
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.19.2'
+    VERSION = '1.9.19.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.19.2
+  version: 1.9.19.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: