tramway-event 1.12.3 → 1.12.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/decorators/tramway/event/event_decorator.rb +1 -1
- data/app/decorators/tramway/event/events/show/event_decorator.rb +1 -1
- data/app/models/tramway/event/event.rb +3 -1
- data/config/locales/models.yml +1 -1
- data/config/locales/ru.forms.yml +1 -1
- data/lib/tramway/event/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '0608556ec1455f2c866928e358bacb162d2d23cd2addf7b48b86a6aaec061e55'
|
|
4
|
+
data.tar.gz: c99be8faf627154f6cd8a49849a39fd3fe61f1b7baa1c2195abd2b81c1816e56
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9064b081f4c524f9d581706002ccf043387fc4c47826fd8611510c46f5ed67ec4cde3a2866ee7f35342bf5d4c70e132d960df1a92b3d926924190327899d7546
|
|
7
|
+
data.tar.gz: 35f25dd3478061426fc7f3126d3d72387b613a341b70a4d5e5b93afb5828152ad8acdd1268b2057cf27a671701cd8d3c5289c6b2dbaff8b9f1589b4ac36a06c8
|
|
@@ -7,7 +7,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def show_attributes
|
|
10
|
-
%i[
|
|
10
|
+
%i[title duration events_link state created_at photo request_collecting_duration description participants_list]
|
|
11
11
|
end
|
|
12
12
|
|
|
13
13
|
def show_associations
|
|
@@ -45,7 +45,7 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
|
|
|
45
45
|
|
|
46
46
|
def responsible_person
|
|
47
47
|
{
|
|
48
|
-
title:
|
|
48
|
+
title: Tramway::User::UserDecorator.decorate(object.creator).name,
|
|
49
49
|
phone: (object.creator.phone if object.creator&.phone&.present?),
|
|
50
50
|
email: (object.creator.email if object.creator&.email&.present?),
|
|
51
51
|
social_networks: (object.creator.social_networks.active if object.creator.respond_to?(:social_networks))
|
|
@@ -34,7 +34,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
|
|
|
34
34
|
return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
|
|
35
35
|
return :will_begin_soon if request_collecting_begin_date > DateTime.now
|
|
36
36
|
return :is_over if request_collecting_end_date.present? && request_collecting_end_date.to_date < Date.today
|
|
37
|
-
|
|
37
|
+
if request_collecting_begin_date&.past? && (request_collecting_end_date&.future? || request_collecting_end_date&.today?)
|
|
38
|
+
return :are_being_right_now
|
|
39
|
+
end
|
|
38
40
|
return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
|
|
39
41
|
end
|
|
40
42
|
|
data/config/locales/models.yml
CHANGED
data/config/locales/ru.forms.yml
CHANGED
|
@@ -3,4 +3,4 @@ ru:
|
|
|
3
3
|
tramway:
|
|
4
4
|
event:
|
|
5
5
|
participant_form_field:
|
|
6
|
-
select_options: "в случае выбора тип поля \"Выпадающий список\", введите через запятую без пробелов все элементы
|
|
6
|
+
select_options: "в случае выбора тип поля \"Выпадающий список\", введите через запятую без пробелов все элементы списка. Оставив это поле пустым, список будет содержать только пункты Да и Нет"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tramway-event
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.12.3
|
|
4
|
+
version: 1.12.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Pavel Kalashnikov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-04-
|
|
11
|
+
date: 2020-04-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: configus
|