decidim-meetings 0.25.0.rc1 → 0.25.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/meetings/online_meeting_cell.rb +7 -1
  3. data/app/cells/decidim/meetings/online_meeting_link_cell.rb +0 -7
  4. data/app/presenters/decidim/meetings/meeting_presenter.rb +3 -24
  5. data/app/views/decidim/meetings/admin/poll/_form.html.erb +1 -1
  6. data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb +1 -1
  7. data/app/views/decidim/meetings/meetings/show.html.erb +1 -1
  8. data/lib/decidim/meetings/version.rb +1 -1
  9. metadata +15 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9c738813676b470073aba100e5738157200f3fd4524dc7ab41891788325e364c
4
- data.tar.gz: fc26fc0d4dad695d49eccf921b9283181eb8f7c4e37e88ac21baa51d8d532af8
3
+ metadata.gz: ac1a613a93b00b2da554476793d23b6563e773d39e963a56b825e36756b6658d
4
+ data.tar.gz: 49ba72f4f57ca75e54c05565cb7db802c712c0ab60568c9ee3f0be49cd08607f
5
5
  SHA512:
6
- metadata.gz: 3ec9fb4d2d058e92918eeeaef0d75c474f31378c18a937050d1e6ede4cd50c4651592c6a08bd5d7b4cf373c2692ac17219a797ff8c6c5507d1ec94c1dffb1952
7
- data.tar.gz: 72bca90a6014a28d0267b3cdf7c23cbefd8736e38e351c20370eb5d3089a20f64d3cf0998bad163dd5a4e26b3a62166c60ee3b433f66ab4ffa4e026229a4868d
6
+ metadata.gz: c61bf5ed08406df42a644a35f79e90a09832277346311b357fe55995c1cbfe5b6e043a78f2c0f083980d960095e6eedc68f876e79004b6e49a1646b4d9857bc7
7
+ data.tar.gz: a4e7dbcb203eecba85d7245a090b47ba11f94404b928f081de8afff154f8bb7f43fc0f5c76d057351a19ce4445d1f7bda1c1f0468e0d1ead50d72915260f2add
data/app/cells/decidim/meetings/online_meeting_cell.rb CHANGED
@@ -11,7 +11,6 @@ module Decidim
11
11
  @embedder ||= MeetingIframeEmbedder.new(model.online_meeting_url)
12
12
  end
13
13
 
14
- delegate :live?, to: :model
15
14
  delegate :embeddable?, to: :embedder
16
15
 
17
16
  def live_event_url
@@ -22,6 +21,13 @@ module Decidim
22
21
  end
23
22
  end
24
23
 
24
+ def live?
25
+ model.start_time &&
26
+ model.end_time &&
27
+ Time.current >= (model.start_time - 10.minutes) &&
28
+ Time.current <= model.end_time
29
+ end
30
+
25
31
  def future?
26
32
  Time.current <= model.start_time && !live?
27
33
  end
data/app/cells/decidim/meetings/online_meeting_link_cell.rb CHANGED
@@ -22,13 +22,6 @@ module Decidim
22
22
  def show_embed?
23
23
  model.show_embedded_iframe? && embedder.embeddable?
24
24
  end
25
-
26
- def live?
27
- model.start_time &&
28
- model.end_time &&
29
- Time.current >= (model.start_time - 10.minutes) &&
30
- Time.current <= model.end_time
31
- end
32
25
  end
33
26
  end
34
27
  end
data/app/presenters/decidim/meetings/meeting_presenter.rb CHANGED
@@ -5,22 +5,17 @@ module Decidim
5
5
  #
6
6
  # Decorator for meetings
7
7
  #
8
- class MeetingPresenter < SimpleDelegator
9
- include Decidim::TranslationsHelper
8
+ class MeetingPresenter < Decidim::ResourcePresenter
10
9
  include Decidim::ResourceHelper
11
- include Decidim::SanitizeHelper
12
10
 
13
11
  def meeting
14
12
  __getobj__
15
13
  end
16
14
 
17
- def title(links: false, all_locales: false)
15
+ def title(links: false, html_escape: false, all_locales: false)
18
16
  return unless meeting
19
17
 
20
- handle_locales(meeting.title, all_locales) do |content|
21
- renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
22
- renderer.render(links: links).html_safe
23
- end
18
+ super meeting.title, links, html_escape, all_locales
24
19
  end
25
20
 
26
21
  def description(links: false, all_locales: false)
@@ -130,22 +125,6 @@ module Decidim
130
125
 
131
126
  proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
132
127
  end
133
-
134
- private
135
-
136
- def handle_locales(content, all_locales, &block)
137
- if all_locales
138
- content.each_with_object({}) do |(key, value), parsed_content|
139
- parsed_content[key] = if key == "machine_translations"
140
- handle_locales(value, all_locales, &block)
141
- else
142
- block.call(value)
143
- end
144
- end
145
- else
146
- yield(translated_attribute(content))
147
- end
148
- end
149
128
  end
150
129
  end
151
130
  end
data/app/views/decidim/meetings/admin/poll/_form.html.erb CHANGED
@@ -54,7 +54,7 @@
54
54
  <% end %>
55
55
  </div>
56
56
 
57
- <%= javascript_pack_tag "decidim_forms_admin" %>
57
+ <%= javascript_pack_tag "decidim_forms_admin", defer: false %>
58
58
 
59
59
  <% if questionnaire.questions_editable? %>
60
60
  <script>
data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb CHANGED
@@ -4,7 +4,7 @@
4
4
  <div class="card card--meeting">
5
5
  <div class="card__content">
6
6
  <%= link_to resource_locator(meeting).path, class: "card__link" do %>
7
- <h5 class="card__title"><%= present(meeting).title %></h5>
7
+ <h5 class="card__title"><%= present(meeting).title(html_escape: true) %></h5>
8
8
  <% end %>
9
9
  <div class="card__datetime">
10
10
  <div class="card__datetime__date">
data/app/views/decidim/meetings/meetings/show.html.erb CHANGED
@@ -23,7 +23,7 @@ edit_link(
23
23
  <% end %>
24
24
  </div>
25
25
 
26
- <h2 class="heading2"><%= present(meeting).title(links: true) %></h2>
26
+ <h2 class="heading2"><%= present(meeting).title(links: true, html_escape: true ) %></h2>
27
27
 
28
28
  <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), has_actions: true, from: meeting, context: { extra_classes: ["author-data--small"] } %>
29
29
 
data/lib/decidim/meetings/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-meetings version.
5
5
  module Meetings
6
6
  def self.version
7
- "0.25.0.rc1"
7
+ "0.25.0.rc2"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-meetings
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.0.rc1
4
+ version: 0.25.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-07-28 00:00:00.000000000 Z
13
+ date: 2021-09-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.25.0.rc1
21
+ version: 0.25.0.rc2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.25.0.rc1
28
+ version: 0.25.0.rc2
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-forms
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.25.0.rc1
35
+ version: 0.25.0.rc2
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.25.0.rc1
42
+ version: 0.25.0.rc2
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: icalendar
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
60
60
  requirements:
61
61
  - - '='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.25.0.rc1
63
+ version: 0.25.0.rc2
64
64
  type: :development
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.25.0.rc1
70
+ version: 0.25.0.rc2
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: decidim-assemblies
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.25.0.rc1
77
+ version: 0.25.0.rc2
78
78
  type: :development
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.25.0.rc1
84
+ version: 0.25.0.rc2
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: decidim-dev
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.25.0.rc1
91
+ version: 0.25.0.rc2
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - '='
97
97
  - !ruby/object:Gem::Version
98
- version: 0.25.0.rc1
98
+ version: 0.25.0.rc2
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: decidim-participatory_processes
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - '='
104
104
  - !ruby/object:Gem::Version
105
- version: 0.25.0.rc1
105
+ version: 0.25.0.rc2
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
110
  - - '='
111
111
  - !ruby/object:Gem::Version
112
- version: 0.25.0.rc1
112
+ version: 0.25.0.rc2
113
113
  description: A meetings component for decidim's participatory spaces.
114
114
  email:
115
115
  - josepjaume@gmail.com
@@ -531,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
531
531
  - !ruby/object:Gem::Version
532
532
  version: 1.3.1
533
533
  requirements: []
534
- rubygems_version: 3.1.4
534
+ rubygems_version: 3.1.2
535
535
  signing_key:
536
536
  specification_version: 4
537
537
  summary: Decidim meetings module