decidim-meetings 0.19.1 → 0.20.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/decidim/meetings/directory/meetings_controller.rb +1 -1
- data/app/controllers/decidim/meetings/registrations_controller.rb +1 -1
- data/app/models/decidim/meetings/meeting.rb +7 -0
- data/app/views/decidim/meetings/admin/meetings/_form.html.erb +3 -0
- data/config/locales/ca.yml +3 -0
- data/config/locales/cs.yml +3 -0
- data/config/locales/en.yml +3 -0
- data/config/locales/fi-plain.yml +3 -0
- data/config/locales/fi.yml +3 -0
- data/config/locales/fr.yml +3 -0
- data/config/locales/hu.yml +3 -0
- data/config/locales/it.yml +3 -0
- data/config/locales/nl.yml +3 -0
- data/config/locales/no.yml +2 -0
- data/lib/decidim/meetings/version.rb +1 -1
- metadata +14 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c7f7b08b282425ea11aaacb0cd4817ad07747b284bcae253ca8460b6e8dea892
|
4
|
+
data.tar.gz: 8f758cb218b3eebcfa0f5c5095b540a491bceb57c5901098c4c29d7c96ad8ec0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 74a3158538b75c5c4cc6ece3b82250452c488353306f81956c7574bd96eb585fc5014a973485d66afbba32512fb5da7dd3e3d112a4fdb9fe760d5ccec5f2fa54
|
7
|
+
data.tar.gz: 704d9dfb602de8851fa6b40688ae4b00fa6c0699e42dfe5511c4a7b5eb17f61d77ec43415cc68d71608e2eca2d6b104a6ae52322fc3b02f74c36feaeee93beae
|
@@ -20,7 +20,7 @@ module Decidim
|
|
20
20
|
def index
|
21
21
|
@meeting_spaces = search.results.map do |meeting|
|
22
22
|
klass = meeting.component.participatory_space.class
|
23
|
-
[klass.model_name.name.underscore, klass.model_name.human
|
23
|
+
[klass.model_name.name.underscore, klass.model_name.human(count: 2)]
|
24
24
|
end.uniq
|
25
25
|
@meeting_spaces = @meeting_spaces.sort_by do |_param, name|
|
26
26
|
name
|
@@ -9,7 +9,7 @@ module Decidim
|
|
9
9
|
def answer
|
10
10
|
enforce_permission_to :join, :meeting, meeting: meeting
|
11
11
|
|
12
|
-
@form = form(Decidim::Forms::QuestionnaireForm).from_params(params)
|
12
|
+
@form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token: session_token)
|
13
13
|
|
14
14
|
JoinMeeting.call(meeting, current_user, @form) do
|
15
15
|
on(:ok) do
|
@@ -20,6 +20,7 @@ module Decidim
|
|
20
20
|
include Decidim::Hashtaggable
|
21
21
|
include Decidim::Forms::HasQuestionnaire
|
22
22
|
include Decidim::Paddable
|
23
|
+
include Decidim::ActsAsAuthor
|
23
24
|
|
24
25
|
belongs_to :organizer, foreign_key: "organizer_id", class_name: "Decidim::User", optional: true
|
25
26
|
has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
|
@@ -61,6 +62,12 @@ module Decidim
|
|
61
62
|
registrations.where.not(decidim_user_group_id: nil)
|
62
63
|
end
|
63
64
|
|
65
|
+
# Returns the presenter for this author, to be used in the views.
|
66
|
+
# Required by ActsAsAuthor.
|
67
|
+
def presenter
|
68
|
+
Decidim::Meetings::MeetingPresenter.new(self)
|
69
|
+
end
|
70
|
+
|
64
71
|
def self.log_presenter_class_for(_log)
|
65
72
|
Decidim::Meetings::AdminLog::MeetingPresenter
|
66
73
|
end
|
@@ -13,14 +13,17 @@
|
|
13
13
|
|
14
14
|
<div class="row column">
|
15
15
|
<%= form.text_field :address %>
|
16
|
+
<p class="help-text"><%= t(".address_help") %></p>
|
16
17
|
</div>
|
17
18
|
|
18
19
|
<div class="row column">
|
19
20
|
<%= form.translated :text_area, :location %>
|
21
|
+
<p class="help-text"><%= t(".location_help") %></p>
|
20
22
|
</div>
|
21
23
|
|
22
24
|
<div class="row column">
|
23
25
|
<%= form.translated :text_area, :location_hints %>
|
26
|
+
<p class="help-text"><%= t(".location_hints_help") %></p>
|
24
27
|
</div>
|
25
28
|
|
26
29
|
<div class="row">
|
data/config/locales/ca.yml
CHANGED
@@ -238,6 +238,9 @@ ca:
|
|
238
238
|
edit:
|
239
239
|
update: Actualitzar
|
240
240
|
form:
|
241
|
+
address_help: 'Adreça: usada per Geocoder per a trobar la localització'
|
242
|
+
location_help: 'Localització: missatge dirigit als usuaris indicant el lloc on trobar-se'
|
243
|
+
location_hints_help: 'Ajuda de localització: informació addicional. Per exemple: la planta de l''edifici'
|
241
244
|
select_organizer: Selecciona l'organitzadora
|
242
245
|
index:
|
243
246
|
title: Trobades
|
data/config/locales/cs.yml
CHANGED
@@ -244,6 +244,9 @@ cs:
|
|
244
244
|
edit:
|
245
245
|
update: Aktualizace
|
246
246
|
form:
|
247
|
+
address_help: 'Adresa: použitý Geocoder pro nalezení polohy'
|
248
|
+
location_help: 'Poloha: zpráva určená uživatelům, kteří předávají místo, aby se setkali'
|
249
|
+
location_hints_help: 'Určení polohy: dodatečné informace. Příklad: patro budovy'
|
247
250
|
select_organizer: Vyberte organizátor
|
248
251
|
index:
|
249
252
|
title: Setkání
|
data/config/locales/en.yml
CHANGED
@@ -239,6 +239,9 @@ en:
|
|
239
239
|
edit:
|
240
240
|
update: Update
|
241
241
|
form:
|
242
|
+
address_help: 'Address: used by Geocoder to find the location'
|
243
|
+
location_help: 'Location: message directed to the users implying the spot to meet at'
|
244
|
+
location_hints_help: 'Location hints: additional info. Example: the floor of the building'
|
242
245
|
select_organizer: Select the organizer
|
243
246
|
index:
|
244
247
|
title: Meetings
|
data/config/locales/fi-plain.yml
CHANGED
@@ -238,6 +238,9 @@ fi-pl:
|
|
238
238
|
edit:
|
239
239
|
update: Päivitä
|
240
240
|
form:
|
241
|
+
address_help: 'Osoite: käytetään sijainnin löytämiseksi geokoodaukseen'
|
242
|
+
location_help: 'Sijainti: viesti osallistujille tapaamispaikan sijainnin löytämiseksi'
|
243
|
+
location_hints_help: 'Sijainnin vihjeteksti: lisätietoja sijainnista. Esimerkiksi rakennuksen kerros sijaintipaikalla'
|
241
244
|
select_organizer: Valitse järjestäjä
|
242
245
|
index:
|
243
246
|
title: Tapahtumat
|
data/config/locales/fi.yml
CHANGED
@@ -238,6 +238,9 @@ fi:
|
|
238
238
|
edit:
|
239
239
|
update: Päivitä
|
240
240
|
form:
|
241
|
+
address_help: 'Osoite: käytetään sijainnin löytämiseksi geokoodaukseen'
|
242
|
+
location_help: 'Sijainti: viesti osallistujille tapaamispaikan sijainnin löytämiseksi'
|
243
|
+
location_hints_help: 'Sijainnin vihjeteksti: lisätietoja sijainnista. Esimerkiksi rakennuksen kerros sijaintipaikalla'
|
241
244
|
select_organizer: Valitse järjestäjä
|
242
245
|
index:
|
243
246
|
title: Tapahtumat
|
data/config/locales/fr.yml
CHANGED
@@ -238,6 +238,9 @@ fr:
|
|
238
238
|
edit:
|
239
239
|
update: Mettre à jour
|
240
240
|
form:
|
241
|
+
address_help: 'L''adresse entrée est utilisée par le géocodage pour trouver l''emplacement et afficher la réunion sur la carte. Format accepté : [n°] [rue] [code postal] [ville]'
|
242
|
+
location_help: 'Le lieu indique le nom de l''endroit qui accueille la réunion (ex : Maison de la citoyenneté)'
|
243
|
+
location_hints_help: 'Données de localisation : infos additionnelles (ex : 2ème étage, ...)'
|
241
244
|
select_organizer: Sélectionnez l'organisateur
|
242
245
|
index:
|
243
246
|
title: Rencontres
|
data/config/locales/hu.yml
CHANGED
@@ -238,6 +238,9 @@ hu:
|
|
238
238
|
edit:
|
239
239
|
update: Frissítés
|
240
240
|
form:
|
241
|
+
address_help: 'Cím: Geocoder használata a helymeghatározáshoz'
|
242
|
+
location_help: 'Helyszín: üzenet az adott felhasználóknak a találkozó helyéről'
|
243
|
+
location_hints_help: 'Helymeghatározási tippek: további információk. Példa: az épület padlója'
|
241
244
|
select_organizer: Válassz szervezőt
|
242
245
|
index:
|
243
246
|
title: Találkozók
|
data/config/locales/it.yml
CHANGED
@@ -238,6 +238,9 @@ it:
|
|
238
238
|
edit:
|
239
239
|
update: Modifica
|
240
240
|
form:
|
241
|
+
address_help: 'Indirizzo: usato da Geocoder per trovare la posizione'
|
242
|
+
location_help: 'Posizione: messaggio diretto agli utenti che riporta il luogo dell''incontro'
|
243
|
+
location_hints_help: 'Suggerimenti di posizione: informazioni aggiuntive. Esempio: il piano dell''edificio'
|
241
244
|
select_organizer: Seleziona l'organizzatore
|
242
245
|
index:
|
243
246
|
title: Incontri
|
data/config/locales/nl.yml
CHANGED
@@ -238,6 +238,9 @@ nl:
|
|
238
238
|
edit:
|
239
239
|
update: Bijwerken
|
240
240
|
form:
|
241
|
+
address_help: 'Adres: gebruikt door Geocoder om de locatie te vinden'
|
242
|
+
location_help: 'Locatie: bericht gericht aan de gebruikers die de locatie op een vergadering plaatsen'
|
243
|
+
location_hints_help: 'Locatie hint: extra info. Voorbeeld: de vloer van het gebouw'
|
241
244
|
select_organizer: Selecteer de organisator
|
242
245
|
index:
|
243
246
|
title: Events
|
data/config/locales/no.yml
CHANGED
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.
|
4
|
+
version: 0.20.0
|
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:
|
13
|
+
date: 2020-01-08 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: cells-erb
|
@@ -46,28 +46,28 @@ dependencies:
|
|
46
46
|
requirements:
|
47
47
|
- - '='
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 0.
|
49
|
+
version: 0.20.0
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
54
|
- - '='
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 0.
|
56
|
+
version: 0.20.0
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: decidim-forms
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
61
|
- - '='
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 0.
|
63
|
+
version: 0.20.0
|
64
64
|
type: :runtime
|
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.
|
70
|
+
version: 0.20.0
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: httparty
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
@@ -144,56 +144,56 @@ dependencies:
|
|
144
144
|
requirements:
|
145
145
|
- - '='
|
146
146
|
- !ruby/object:Gem::Version
|
147
|
-
version: 0.
|
147
|
+
version: 0.20.0
|
148
148
|
type: :development
|
149
149
|
prerelease: false
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
151
151
|
requirements:
|
152
152
|
- - '='
|
153
153
|
- !ruby/object:Gem::Version
|
154
|
-
version: 0.
|
154
|
+
version: 0.20.0
|
155
155
|
- !ruby/object:Gem::Dependency
|
156
156
|
name: decidim-assemblies
|
157
157
|
requirement: !ruby/object:Gem::Requirement
|
158
158
|
requirements:
|
159
159
|
- - '='
|
160
160
|
- !ruby/object:Gem::Version
|
161
|
-
version: 0.
|
161
|
+
version: 0.20.0
|
162
162
|
type: :development
|
163
163
|
prerelease: false
|
164
164
|
version_requirements: !ruby/object:Gem::Requirement
|
165
165
|
requirements:
|
166
166
|
- - '='
|
167
167
|
- !ruby/object:Gem::Version
|
168
|
-
version: 0.
|
168
|
+
version: 0.20.0
|
169
169
|
- !ruby/object:Gem::Dependency
|
170
170
|
name: decidim-dev
|
171
171
|
requirement: !ruby/object:Gem::Requirement
|
172
172
|
requirements:
|
173
173
|
- - '='
|
174
174
|
- !ruby/object:Gem::Version
|
175
|
-
version: 0.
|
175
|
+
version: 0.20.0
|
176
176
|
type: :development
|
177
177
|
prerelease: false
|
178
178
|
version_requirements: !ruby/object:Gem::Requirement
|
179
179
|
requirements:
|
180
180
|
- - '='
|
181
181
|
- !ruby/object:Gem::Version
|
182
|
-
version: 0.
|
182
|
+
version: 0.20.0
|
183
183
|
- !ruby/object:Gem::Dependency
|
184
184
|
name: decidim-participatory_processes
|
185
185
|
requirement: !ruby/object:Gem::Requirement
|
186
186
|
requirements:
|
187
187
|
- - '='
|
188
188
|
- !ruby/object:Gem::Version
|
189
|
-
version: 0.
|
189
|
+
version: 0.20.0
|
190
190
|
type: :development
|
191
191
|
prerelease: false
|
192
192
|
version_requirements: !ruby/object:Gem::Requirement
|
193
193
|
requirements:
|
194
194
|
- - '='
|
195
195
|
- !ruby/object:Gem::Version
|
196
|
-
version: 0.
|
196
|
+
version: 0.20.0
|
197
197
|
description: A meetings component for decidim's participatory spaces.
|
198
198
|
email:
|
199
199
|
- josepjaume@gmail.com
|