tramway-event 1.9.26 → 1.9.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/application.js +8 -0
- data/app/assets/javascripts/tramway/event/application.js +1 -3
- data/app/decorators/tramway/event/event_decorator.rb +12 -1
- data/app/forms/tramway/event/participant_form_field_form.rb +6 -6
- data/config/initializers/tramway.rb +2 -2
- data/config/locales/models.yml +2 -0
- data/lib/tramway/event/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 254c506135da94272d3b29c64e8433408899887d076f9ddf90c500575fce39bc
|
|
4
|
+
data.tar.gz: ccf6e8f67d7305b19d57c262a7375d7f6cee0c7a22e8f38a2f9040ff67dceff5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5511a2b01b04e1fcc82970f02eb620f94f3cdade6679841846400597b2647c6a61dde2fd5a3299b7da5e640d1c74bed105085dd48789efd87caee00c50a77d36
|
|
7
|
+
data.tar.gz: a5d4093e097bbf6c56a37e6151f7723ae4bf83d907f35313df0794208c2452038fa462ecb436ba5b7e3859546c0ba1e9d6137fc37d40a4949ca5f6a18285ceef
|
|
@@ -10,6 +10,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
|
10
10
|
%i[
|
|
11
11
|
title
|
|
12
12
|
duration
|
|
13
|
+
events_link
|
|
13
14
|
state
|
|
14
15
|
created_at
|
|
15
16
|
photo
|
|
@@ -24,7 +25,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
|
24
25
|
end
|
|
25
26
|
|
|
26
27
|
def list_attributes
|
|
27
|
-
%i[requested_participants approved_participants]
|
|
28
|
+
%i[requested_participants approved_participants events_link]
|
|
28
29
|
end
|
|
29
30
|
end
|
|
30
31
|
|
|
@@ -71,6 +72,16 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
|
71
72
|
end
|
|
72
73
|
end
|
|
73
74
|
|
|
75
|
+
def events_link
|
|
76
|
+
event_link = Tramway::Event::Engine.routes.url_helpers.event_path object
|
|
77
|
+
event_url = ['molodoy.online', event_link].join
|
|
78
|
+
content_tag(:div) do
|
|
79
|
+
id = "event#{object.id}"
|
|
80
|
+
concat link_to event_url, event_url, id: id
|
|
81
|
+
concat copy_to_clipboard id
|
|
82
|
+
end
|
|
83
|
+
end
|
|
84
|
+
|
|
74
85
|
def request_collecting_duration
|
|
75
86
|
return if object.request_collecting_begin_date.nil? || object.request_collecting_end_date.nil?
|
|
76
87
|
|
|
@@ -7,12 +7,12 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplic
|
|
|
7
7
|
def initialize(object)
|
|
8
8
|
super(object).tap do
|
|
9
9
|
form_properties event: :association,
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
title: :string,
|
|
11
|
+
description: :string,
|
|
12
|
+
field_type: :default,
|
|
13
|
+
options: :text,
|
|
14
|
+
list_field: :boolean,
|
|
15
|
+
position: :numeric
|
|
16
16
|
end
|
|
17
17
|
end
|
|
18
18
|
|
|
@@ -8,6 +8,6 @@
|
|
|
8
8
|
::Tramway::Event::Partaking,
|
|
9
9
|
::Tramway::Event::Place,
|
|
10
10
|
project: :event)
|
|
11
|
-
::Tramway::Admin.set_notificable_queries new_participants:
|
|
11
|
+
::Tramway::Admin.set_notificable_queries new_participants: lambda { |current_user|
|
|
12
12
|
::Tramway::Event::Participant.active.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
|
|
13
|
-
|
|
13
|
+
}
|
data/config/locales/models.yml
CHANGED
|
@@ -20,6 +20,7 @@ ru:
|
|
|
20
20
|
tramway/event/place: Место
|
|
21
21
|
attributes:
|
|
22
22
|
tramway/event/event:
|
|
23
|
+
events_link: Ссылка на мероприятие
|
|
23
24
|
title: Название
|
|
24
25
|
name: Название
|
|
25
26
|
description: Описание
|
|
@@ -49,6 +50,7 @@ ru:
|
|
|
49
50
|
participation_state: Статус участника
|
|
50
51
|
event: Мероприятие
|
|
51
52
|
values: Данные
|
|
53
|
+
participation_state_event: Статус участия в мероприятии
|
|
52
54
|
tramway/event/section:
|
|
53
55
|
title: Название
|
|
54
56
|
description: Описание
|
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.9.
|
|
4
|
+
version: 1.9.27
|
|
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-01-
|
|
11
|
+
date: 2020-01-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Rails engine for events
|
|
14
14
|
email:
|
|
@@ -21,6 +21,7 @@ files:
|
|
|
21
21
|
- README.md
|
|
22
22
|
- Rakefile
|
|
23
23
|
- app/assets/config/tramway_event_manifest.js
|
|
24
|
+
- app/assets/javascripts/application.js
|
|
24
25
|
- app/assets/javascripts/tramway/event/application.js
|
|
25
26
|
- app/assets/stylesheets/tramway/event/application.css.sass
|
|
26
27
|
- app/assets/stylesheets/tramway/event/events/show.css.sass
|