decidim-meetings 0.28.1 → 0.28.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb +1 -1
- data/app/cells/decidim/meetings/meeting_l/image.erb +3 -3
- data/app/models/decidim/meetings/meeting.rb +5 -1
- data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +0 -4
- data/app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb +1 -1
- data/app/services/decidim/meetings/close_meeting_reminder_generator.rb +11 -5
- data/app/views/decidim/meetings/meetings/_meeting_aside.html.erb +0 -1
- data/config/locales/ar.yml +0 -1
- data/config/locales/bg.yml +650 -0
- data/config/locales/ca.yml +1 -1
- data/config/locales/cs.yml +0 -1
- data/config/locales/de.yml +1 -1
- data/config/locales/el.yml +0 -1
- data/config/locales/gl.yml +0 -1
- data/config/locales/hu.yml +0 -1
- data/config/locales/it.yml +0 -1
- data/config/locales/lt.yml +0 -1
- data/config/locales/nl.yml +0 -1
- data/config/locales/no.yml +0 -1
- data/config/locales/pl.yml +96 -0
- data/config/locales/pt-BR.yml +0 -1
- data/config/locales/pt.yml +0 -1
- data/config/locales/ro-RO.yml +0 -1
- data/config/locales/sv.yml +0 -1
- data/config/locales/tr-TR.yml +3 -0
- data/config/locales/zh-TW.yml +0 -1
- data/lib/decidim/meetings/seeds.rb +0 -3
- data/lib/decidim/meetings/version.rb +1 -1
- metadata +18 -19
- data/app/presenters/decidim/meetings/log/resource_presenter.rb +0 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b39a9cc837cdf7ceb50a11600d77bf52bc43b826f59904a547ded94bd4ff4748
|
4
|
+
data.tar.gz: 87830a9f87a179d747f8fd14749abe9774f124778b5ba6bdc98591bc42f39c5f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f9376c59d4176d0df307fa963890ed3c35dd5bf3b4469087e6972348cdd08d78f2f705e820ee19cba564cc70566f6cc999e80cb65dd8fcbbd49cbdad405d283d
|
7
|
+
data.tar.gz: 1bffbca3121562dcb32af901f743817e004ab5dff16ec2f5dba433910cfb130d87947db7fd4f2cef00c9f0825d0e57111cca66e41a7bbb3745c10124b6586b1f
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<div class="form__wrapper">
|
9
9
|
<%= cell("decidim/represent_user_group", form) %>
|
10
10
|
<%= cell("decidim/public_participation", form) %>
|
11
|
-
<
|
11
|
+
<div class="meeting__registration-modal__terms"><%= registration_terms_text %></div>
|
12
12
|
</div>
|
13
13
|
</div>
|
14
14
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<time class="card__calendar" datetime="<%= meeting.start_time.iso8601 %>">
|
2
|
-
<
|
3
|
-
<
|
4
|
-
<
|
2
|
+
<span class="card__calendar-month"><%= l(meeting.start_time, format: "%b") %></span>
|
3
|
+
<span class="card__calendar-day"><%= l(meeting.start_time, format: "%d") %></span>
|
4
|
+
<span class="card__calendar-year"><%= l(meeting.start_time, format: "%Y") %></span>
|
5
5
|
</time>
|
@@ -170,7 +170,7 @@ module Decidim
|
|
170
170
|
end
|
171
171
|
|
172
172
|
def can_be_joined_by?(user)
|
173
|
-
!
|
173
|
+
!started? && registrations_enabled? && can_participate?(user)
|
174
174
|
end
|
175
175
|
|
176
176
|
def can_register_invitation?(user)
|
@@ -182,6 +182,10 @@ module Decidim
|
|
182
182
|
closed_at.present?
|
183
183
|
end
|
184
184
|
|
185
|
+
def started?
|
186
|
+
start_time < Time.current
|
187
|
+
end
|
188
|
+
|
185
189
|
def past?
|
186
190
|
end_time < Time.current
|
187
191
|
end
|
@@ -15,10 +15,6 @@ module Decidim
|
|
15
15
|
class MeetingPresenter < Decidim::Log::BasePresenter
|
16
16
|
private
|
17
17
|
|
18
|
-
def resource_presenter
|
19
|
-
@resource_presenter ||= Decidim::Meetings::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
|
20
|
-
end
|
21
|
-
|
22
18
|
def diff_fields_mapping
|
23
19
|
{
|
24
20
|
address: :string,
|
data/app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb
CHANGED
@@ -10,7 +10,7 @@ module Decidim
|
|
10
10
|
def present
|
11
11
|
return unless value
|
12
12
|
|
13
|
-
renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.
|
13
|
+
renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.decidim_escape_translated(value))
|
14
14
|
renderer.render(links: false).html_safe
|
15
15
|
end
|
16
16
|
end
|
@@ -38,11 +38,9 @@ module Decidim
|
|
38
38
|
|
39
39
|
def send_reminders(component)
|
40
40
|
intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
|
41
|
-
space_admins = Decidim::ParticipatoryProcessUserRole.where(decidim_participatory_process_id: component.participatory_space_id, role: "admin").collect(&:user)
|
42
|
-
space_admins = (global_admins + space_admins).uniq
|
43
41
|
intervals.each do |interval|
|
44
42
|
finder_query(component.id, interval).find_each do |meeting|
|
45
|
-
authors = meeting.official? ? space_admins : [meeting.author]
|
43
|
+
authors = meeting.official? ? space_admins(component) : [meeting.author]
|
46
44
|
authors.each do |author|
|
47
45
|
send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
|
48
46
|
next unless send_notif == "1"
|
@@ -60,8 +58,16 @@ module Decidim
|
|
60
58
|
end
|
61
59
|
end
|
62
60
|
|
63
|
-
def
|
64
|
-
@
|
61
|
+
def space_admins(component)
|
62
|
+
@space_admins ||= begin
|
63
|
+
space_admins = if component.participatory_space.respond_to?(:user_roles)
|
64
|
+
component.participatory_space.user_roles(:admin).collect(&:user)
|
65
|
+
else
|
66
|
+
[]
|
67
|
+
end
|
68
|
+
global_admins = component.organization.admins
|
69
|
+
(global_admins + space_admins).uniq
|
70
|
+
end
|
65
71
|
end
|
66
72
|
end
|
67
73
|
end
|