decidim-assemblies 0.18.1 → 0.19.0

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.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/assemblies/assembly_m_cell.rb +2 -0
  3. data/app/commands/decidim/assemblies/admin/create_assembly_admin.rb +1 -0
  4. data/app/commands/decidim/assemblies/admin/update_assembly.rb +2 -0
  5. data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb +22 -0
  6. data/app/helpers/decidim/assemblies/assemblies_helper.rb +1 -1
  7. data/app/models/decidim/assembly.rb +1 -8
  8. data/app/models/decidim/assembly_user_role.rb +1 -0
  9. data/app/permissions/decidim/assemblies/permissions.rb +6 -0
  10. data/app/presenters/decidim/assemblies/admin_log/value_types/member_position_presenter.rb +1 -0
  11. data/app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb +1 -0
  12. data/app/presenters/decidim/log/value_types/assembly_presenter.rb +1 -0
  13. data/app/queries/decidim/assemblies/admin/assembly_members.rb +1 -0
  14. data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +4 -4
  15. data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +3 -3
  16. data/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb +1 -1
  17. data/app/views/decidim/assemblies/assemblies/show.html.erb +3 -5
  18. data/config/locales/ar.yml +0 -1
  19. data/config/locales/ca.yml +1 -1
  20. data/config/locales/cs.yml +1 -1
  21. data/config/locales/de.yml +0 -1
  22. data/config/locales/en.yml +1 -1
  23. data/config/locales/es-MX.yml +0 -1
  24. data/config/locales/es-PY.yml +0 -1
  25. data/config/locales/es.yml +1 -1
  26. data/config/locales/eu.yml +0 -1
  27. data/config/locales/fi-plain.yml +1 -1
  28. data/config/locales/fi.yml +1 -1
  29. data/config/locales/fr.yml +1 -1
  30. data/config/locales/gl.yml +0 -1
  31. data/config/locales/hu.yml +1 -1
  32. data/config/locales/id-ID.yml +0 -1
  33. data/config/locales/it.yml +0 -1
  34. data/config/locales/nl.yml +19 -19
  35. data/config/locales/pl.yml +0 -1
  36. data/config/locales/pt-BR.yml +0 -1
  37. data/config/locales/pt.yml +0 -1
  38. data/config/locales/sv.yml +0 -1
  39. data/config/locales/tr-TR.yml +0 -1
  40. data/lib/decidim/assemblies/admin_engine.rb +3 -0
  41. data/lib/decidim/assemblies/version.rb +1 -1
  42. metadata +8 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2ca550806902d64bbdbcd514a511d9143d3a7a5d386148872f3844cd383e6dab
4
- data.tar.gz: 226343c280dde13c584a74e6157654349535cf6878b70b0c7613786bb9afdafa
3
+ metadata.gz: 470f1c8073482521a76073a7fc2d862aab1d3a393688c2eab70c577823c0d0e5
4
+ data.tar.gz: 87668fa6d5c17982bdca1e528b82e225a79e150e35a9f8ba1c469d010bc65d2f
5
5
  SHA512:
6
- metadata.gz: 624ae379aee05b047ef18a1c17375b795f2312469b586722ccc5f15e51e17dfcc4f9030370f8d66a43e43ddee434b4f4f580aee5fdfbcfe88bd6a079d071ef2b
7
- data.tar.gz: 39a344130ecc50ec6c0ef61001c862538752961a2656467471ccbb6b2e576e34841afb76accc04efff8e96ed4503efef157ba6192f12c8aa454137975236a033
6
+ metadata.gz: d7da8d697197ad0201b7afa20bced1a3a4cafd62448d6b544a741f1fd90aee3cacc109dd0d695de2e893e8a57821ad57947f0a8f51e32b677ee01fedf26090d8
7
+ data.tar.gz: af8164dbd2425488d1ae2c3dbb3dc18a354bcfd508b4b22b1e20d08f4dd0535e84450591bd67c7e4b41dd2cdcd386930b53dc99d906eb5e6a1dbd0ed49ee973a
@@ -32,6 +32,7 @@ module Decidim
32
32
 
33
33
  def statuses
34
34
  return super unless has_children?
35
+
35
36
  [:creation_date, :follow, :children_count]
36
37
  end
37
38
 
@@ -47,6 +48,7 @@ module Decidim
47
48
 
48
49
  if current_user
49
50
  return assemblies.count.to_s if current_user.admin
51
+
50
52
  assemblies.visible_for(current_user).count.to_s
51
53
  else
52
54
  assemblies.public_spaces.count.to_s
@@ -91,6 +91,7 @@ module Decidim
91
91
 
92
92
  def invitation_instructions
93
93
  return "invite_admin" if form.role == "admin"
94
+
94
95
  "invite_collaborator"
95
96
  end
96
97
 
@@ -24,6 +24,7 @@ module Decidim
24
24
  # Returns nothing.
25
25
  def call
26
26
  return broadcast(:invalid) if form.invalid?
27
+
27
28
  update_assembly
28
29
  link_participatory_processes(@assembly)
29
30
 
@@ -116,6 +117,7 @@ module Decidim
116
117
  # Returns nothing.
117
118
  def update_children_count
118
119
  return unless @parent
120
+
119
121
  Assembly.reset_counters(@parent.id, :children_count)
120
122
  end
121
123
  end
@@ -0,0 +1,22 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Assemblies
5
+ module Admin
6
+ # Controller that allows importing assembly private users
7
+ # on assembies
8
+ class ParticipatorySpacePrivateUsersCsvImportsController < Decidim::Admin::ApplicationController
9
+ include Concerns::AssemblyAdmin
10
+ include Decidim::Admin::Concerns::HasPrivateUsersCsvImport
11
+
12
+ def after_import_path
13
+ participatory_space_private_users_path(current_assembly)
14
+ end
15
+
16
+ def privatable_to
17
+ current_assembly
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
@@ -46,7 +46,7 @@ module Decidim
46
46
  Decidim::Assembly::SOCIAL_HANDLERS.each do |handler|
47
47
  handler_name = "#{handler}_handler"
48
48
  if assembly.send(handler_name).present?
49
- html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}", target: "_blank", class: "", title: handler.capitalize
49
+ html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}", target: "_blank", class: "", title: handler.capitalize, rel: "noopener"
50
50
  end
51
51
  end
52
52
  html += "</div>".html_safe
@@ -85,7 +85,7 @@ module Decidim
85
85
 
86
86
  # Overwriting existing method Decidim::HasPrivateUsers.public_spaces
87
87
  def self.public_spaces
88
- where(private_space: false).or(where(private_space: true).where(is_transparent: true))
88
+ where(private_space: false).or(where(private_space: true).where(is_transparent: true)).published
89
89
  end
90
90
 
91
91
  # Scope to return only the promoted assemblies.
@@ -125,13 +125,6 @@ module Decidim
125
125
  self_and_ancestors.where.not(id: id)
126
126
  end
127
127
 
128
- def can_participate?(user)
129
- return true unless private_space?
130
- return false unless user
131
-
132
- users.include?(user)
133
- end
134
-
135
128
  def translated_title
136
129
  Decidim::AssemblyPresenter.new(self).translated_title
137
130
  end
@@ -24,6 +24,7 @@ module Decidim
24
24
  # Private: check if the process and the user have the same organization
25
25
  def user_and_assembly_same_organization
26
26
  return if !assembly || !user
27
+
27
28
  errors.add(:assembly, :invalid) unless user.organization == assembly.organization
28
29
  end
29
30
  end
@@ -22,6 +22,7 @@ module Decidim
22
22
  end
23
23
 
24
24
  return permission_action unless user
25
+
25
26
  if !has_manageable_assemblies? && !user.admin?
26
27
  disallow!
27
28
  return permission_action
@@ -55,12 +56,14 @@ module Decidim
55
56
  # Checks if it has any manageable assembly, with any possible role.
56
57
  def has_manageable_assemblies?(role: :any)
57
58
  return unless user
59
+
58
60
  assemblies_with_role_privileges(role).any?
59
61
  end
60
62
 
61
63
  # Whether the user can manage the given assembly or not.
62
64
  def can_manage_assembly?(role: :any)
63
65
  return unless user
66
+
64
67
  assemblies_with_role_privileges(role).include? assembly
65
68
  end
66
69
 
@@ -85,6 +88,7 @@ module Decidim
85
88
  return disallow! unless can_view_private_space?
86
89
  return allow! if user&.admin?
87
90
  return allow! if assembly.published?
91
+
88
92
  toggle_allow(can_manage_assembly?)
89
93
  end
90
94
 
@@ -147,12 +151,14 @@ module Decidim
147
151
  # Everyone can read the assembly list
148
152
  def user_can_read_assembly_list?
149
153
  return unless read_assembly_list_permission_action?
154
+
150
155
  toggle_allow(user.admin? || has_manageable_assemblies?)
151
156
  end
152
157
 
153
158
  def user_can_read_current_assembly?
154
159
  return unless read_assembly_list_permission_action?
155
160
  return if permission_action.subject == :assembly_list
161
+
156
162
  toggle_allow(user.admin? || can_manage_assembly?)
157
163
  end
158
164
 
@@ -12,6 +12,7 @@ module Decidim
12
12
  # Returns an HTML-safe String.
13
13
  def present
14
14
  return if value.blank?
15
+
15
16
  h.t(value, scope: "decidim.admin.models.assembly_member.positions", default: value)
16
17
  end
17
18
  end
@@ -13,6 +13,7 @@ module Decidim
13
13
  # Returns an HTML-safe String.
14
14
  def present
15
15
  return if value.blank?
16
+
16
17
  h.t(value, scope: "decidim.admin.models.assembly_user_role.roles", default: value)
17
18
  end
18
19
  end
@@ -14,6 +14,7 @@ module Decidim
14
14
  def present
15
15
  return unless value
16
16
  return h.translated_attribute(assembly.title) if assembly
17
+
17
18
  I18n.t("not_found", id: value, scope: "decidim.log.value_types.assembly_presenter")
18
19
  end
19
20
 
@@ -36,6 +36,7 @@ module Decidim
36
36
 
37
37
  def filter_by_search(assembly_members)
38
38
  return assembly_members if @query.blank?
39
+
39
40
  assembly_members.where("LOWER(full_name) LIKE LOWER(?)", "%#{@query}%")
40
41
  end
41
42
 
@@ -45,11 +45,11 @@
45
45
  </span>
46
46
  <% end %>
47
47
  <% if allowed_to? :update, :assembly, assembly: assembly %>
48
- <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %><br />
48
+ <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %><br>
49
49
  <% elsif allowed_to? :preview, :assembly, assembly: assembly %>
50
- <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %><br />
50
+ <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %><br>
51
51
  <% elsif allowed_to? :read, :moderation, assembly: assembly %>
52
- <%= link_to translated_attribute(assembly.title), moderations_path(assembly) %><br />
52
+ <%= link_to translated_attribute(assembly.title), moderations_path(assembly) %><br>
53
53
  <% else %>
54
54
  <%= translated_attribute(assembly.title) %>
55
55
  <% end %>
@@ -80,7 +80,7 @@
80
80
  <%= icon_link_to "pencil", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
81
81
  <% end %>
82
82
 
83
- <% if assembly.parent.blank? && (assembly.children.count.positive? || allowed_to?(:create, :assembly)) %>
83
+ <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
84
84
  <%= icon_link_to "dial",
85
85
  decidim_admin_assemblies.assemblies_path(parent_id: assembly.id),
86
86
  t("decidim.admin.titles.assemblies"),
@@ -25,10 +25,10 @@
25
25
  <% @assembly_user_roles.each do |role| %>
26
26
  <tr>
27
27
  <td>
28
- <%= role.user.name %><br />
28
+ <%= role.user.name %><br>
29
29
  </td>
30
30
  <td>
31
- <%= role.user.email %><br />
31
+ <%= role.user.email %><br>
32
32
  </td>
33
33
  <td>
34
34
  <% if role.user.invitation_sent_at %>
@@ -41,7 +41,7 @@
41
41
  <% end %>
42
42
  </td>
43
43
  <td>
44
- <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br />
44
+ <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br>
45
45
  </td>
46
46
  <td class="table-list__actions">
47
47
  <% if allowed_to?(:invite, :assembly_user_role, user_role: role) && role.user.invited_to_sign_up? %>
@@ -6,7 +6,7 @@
6
6
  </h2>
7
7
  <%= render partial: "decidim/assemblies/filter_by_type" %>
8
8
  </div>
9
- <hr class="reset mt-s mb-s" />
9
+ <hr class="reset mt-s mb-s">
10
10
  <%= render partial: "decidim/shared/participatory_space_filters/show" %>
11
11
  </div>
12
12
  <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
@@ -82,11 +82,11 @@ edit_link(
82
82
  <%= render_hook(:current_participatory_space_meetings) %>
83
83
 
84
84
  <%= attachments_for current_participatory_space %>
85
- <% if current_participatory_space.children.count.positive? %>
85
+ <% if current_participatory_space.children.visible_for(current_user).count.positive? %>
86
86
  <section id="assemblies-grid" class="section row collapse">
87
87
  <h4 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h4>
88
88
  <div class="row small-up-1 medium-up-2 large-up-2 card-grid">
89
- <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.published %>
89
+ <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published %>
90
90
  </div>
91
91
  </section>
92
92
  <% end %>
@@ -203,7 +203,7 @@ edit_link(
203
203
  <div class="definition-data__item closing_date">
204
204
  <span class="definition-data__title"><%= t("closing_date", scope: "decidim.assemblies.show") %></span>
205
205
  <%= l(current_participatory_space.closing_date, format: :decidim_short) %>
206
- <br />
206
+ <br>
207
207
  <%= decidim_sanitize translated_attribute(current_participatory_space.closing_date_reason) %>
208
208
  </div>
209
209
  <% end %>
@@ -221,6 +221,4 @@ edit_link(
221
221
  <% end %>
222
222
  </div>
223
223
 
224
- <%= javascript_include_tag "decidim/proposals/social_share" %>
225
- <%= stylesheet_link_tag "decidim/proposals/social_share" %>
226
224
  <%= javascript_include_tag "decidim/assemblies/assemblies" %>
@@ -275,7 +275,6 @@ ar:
275
275
  others: أخرى
276
276
  public: عامة
277
277
  filter:
278
- all: جميع أنواع الجمعيات
279
278
  commission: لجنة
280
279
  consultative_advisory: استشاري / الاستشارية
281
280
  executive: تنفيذية
@@ -263,7 +263,7 @@ ca:
263
263
  others: Altres
264
264
  public: Públic
265
265
  filter:
266
- all: Tots els tipus d'assemblees
266
+ all: Tots els tipus
267
267
  commission: Comissió
268
268
  consultative_advisory: Consultiva / Assessora
269
269
  executive: Executiu
@@ -269,7 +269,7 @@ cs:
269
269
  others: Ostatní
270
270
  public: Veřejnost
271
271
  filter:
272
- all: Všechny typy sestav
272
+ all: Všechny typy
273
273
  commission: Komise
274
274
  consultative_advisory: Poradní / poradní
275
275
  executive: Výkonný
@@ -263,7 +263,6 @@ de:
263
263
  others: Andere
264
264
  public: Öffentlichkeit
265
265
  filter:
266
- all: Alle Arten von Baugruppen
267
266
  commission: Kommission
268
267
  consultative_advisory: Beratung / Beratung
269
268
  executive: Executive
@@ -264,7 +264,7 @@ en:
264
264
  others: Others
265
265
  public: Public
266
266
  filter:
267
- all: All types of assemblies
267
+ all: All types
268
268
  commission: Commission
269
269
  consultative_advisory: Consultative/Advisory
270
270
  executive: Executive
@@ -263,7 +263,6 @@ es-MX:
263
263
  others: Otros
264
264
  public: Público
265
265
  filter:
266
- all: Todo tipo de montajes.
267
266
  commission: Comisión
268
267
  consultative_advisory: Consultivo / Asesoramiento
269
268
  executive: Ejecutivo
@@ -263,7 +263,6 @@ es-PY:
263
263
  others: Otros
264
264
  public: Público
265
265
  filter:
266
- all: Todo tipo de montajes.
267
266
  commission: Comisión
268
267
  consultative_advisory: Consultivo / Asesoramiento
269
268
  executive: Ejecutivo
@@ -263,7 +263,7 @@ es:
263
263
  others: Otros
264
264
  public: Público
265
265
  filter:
266
- all: Todos los tipos de asambleas
266
+ all: Todos los tipos
267
267
  commission: Comisión
268
268
  consultative_advisory: Consultiva / Asesora
269
269
  executive: Ejecutivo
@@ -263,7 +263,6 @@ eu:
263
263
  others: Beste batzuk
264
264
  public: Publiko
265
265
  filter:
266
- all: Batzar mota guztiak
267
266
  commission: Batzorde
268
267
  consultative_advisory: Aholku / Aholku
269
268
  executive: exekutiboa
@@ -263,7 +263,7 @@ fi-pl:
263
263
  others: Muut
264
264
  public: Julkinen
265
265
  filter:
266
- all: Kaikentyyppiset ryhmät
266
+ all: Kaikki tyypit
267
267
  commission: Komitea
268
268
  consultative_advisory: Konsultti/neuvonantaja
269
269
  executive: Johtaja
@@ -263,7 +263,7 @@ fi:
263
263
  others: Muut
264
264
  public: Julkinen
265
265
  filter:
266
- all: Kaikentyyppiset ryhmät
266
+ all: Kaikki tyypit
267
267
  commission: Komitea
268
268
  consultative_advisory: Konsultti/neuvonantaja
269
269
  executive: Johtaja
@@ -263,7 +263,7 @@ fr:
263
263
  others: Autres
264
264
  public: Public
265
265
  filter:
266
- all: Tous types de montages
266
+ all: Tous les types
267
267
  commission: Commission
268
268
  consultative_advisory: Consultatif
269
269
  executive: Exécutif
@@ -263,7 +263,6 @@ gl:
263
263
  others: Outros
264
264
  public: Público
265
265
  filter:
266
- all: Todo tipo de montaxes
267
266
  commission: Comisión
268
267
  consultative_advisory: Consultivo / asesor
269
268
  executive: Executivo
@@ -263,7 +263,7 @@ hu:
263
263
  others: Egyéb
264
264
  public: Nyilvános
265
265
  filter:
266
- all: Minden típusú gyűlés
266
+ all: Minden típus
267
267
  commission: Bizottság
268
268
  consultative_advisory: Konzultatív / tanácsadó
269
269
  executive: Végrehajtó
@@ -260,7 +260,6 @@ id:
260
260
  others: Lainnya
261
261
  public: Publik
262
262
  filter:
263
- all: Semua jenis majelis
264
263
  commission: Komisi
265
264
  consultative_advisory: Konsultatif / Penasihat
266
265
  executive: Eksekutif
@@ -263,7 +263,6 @@ it:
263
263
  others: Altri
264
264
  public: Pubblico
265
265
  filter:
266
- all: Tutti i tipi di assiemi
267
266
  commission: Commissione
268
267
  consultative_advisory: Consultivo / Advisory
269
268
  executive: Esecutivo
@@ -18,32 +18,32 @@ nl:
18
18
  decidim_area_id: onderwerp
19
19
  decidim_scope_id: Bereik
20
20
  description: Beschrijving
21
- developer_group: Promotorgroep
21
+ developer_group: Organisator
22
22
  domain: Domein
23
- duration: Looptijd
23
+ duration: Duur
24
24
  facebook: Facebook
25
25
  github: GitHub
26
26
  hashtag: Hashtag
27
27
  hero_image: Afbeelding van de startpagina
28
- included_at: Inbegrepen bij
28
+ included_at: Opgenomen op
29
29
  instagram: Instagram
30
30
  internal_organisation: Interne organisatie
31
31
  is_transparent: Is transparant
32
32
  local_area: Organisatiegebied
33
- meta_scope: Omvang metadata
33
+ meta_scope: Scope metadata
34
34
  parent_id: Hoofdgroep
35
- participatory_processes_ids: Verwante bevragingen
35
+ participatory_processes_ids: Verwante inspraakprocessen
36
36
  participatory_scope: Wat wordt besloten
37
37
  participatory_structure: Hoe wordt er besloten
38
38
  private_space: Privé ruimte
39
39
  promoted: Gepromoveerd
40
40
  published_at: Gepubliceerd op
41
- purpose_of_action: Doel van actie
41
+ purpose_of_action: Doelstelling
42
42
  scope_id: Scope
43
43
  scopes_enabled: Scopes ingeschakeld
44
44
  short_description: Korte beschrijving
45
45
  show_statistics: Toon statistieken
46
- slug: URL slak
46
+ slug: URL pad
47
47
  special_features: Speciale functionaliteiten
48
48
  subtitle: Ondertiteling
49
49
  target: Wie doet mee
@@ -151,17 +151,17 @@ nl:
151
151
  assembly_admins: Groep-admins
152
152
  assembly_members: Leden
153
153
  attachment_collections: Mappen
154
- attachment_files: bestanden
154
+ attachment_files: Bestanden
155
155
  attachments: Bijlagen
156
156
  categories: Categorieën
157
157
  components: Onderdelen
158
- info: info
158
+ info: Info
159
159
  moderations: Moderaties
160
160
  private_users: Particuliere gebruikers
161
161
  models:
162
162
  assembly:
163
163
  fields:
164
- created_at: Gemaakt bij
164
+ created_at: Aangemaakt op
165
165
  private: Privaat
166
166
  promoted: Gemarkeerd
167
167
  published: Gepubliceerd
@@ -220,13 +220,13 @@ nl:
220
220
  select_an_area: Selecteer een onderwerp
221
221
  select_an_assembly_type: Selecteer een groepstype
222
222
  select_parent_assembly: Selecteer de hoofdgroep
223
- slug_help: 'URL-slugs worden gebruikt om de URL''s te genereren die naar deze bijeenkomst verwijzen. Enkel letters, cijfers en streepjes worden toegestaan en deze moet beginnen met een letter. Voorbeeld: %{url}'
223
+ slug_help: 'URL-paden worden gebruikt om de URL''s te genereren die naar deze bijeenkomst verwijzen. Enkel letters, cijfers en streepjes worden toegestaan en deze moet beginnen met een letter. Voorbeeld: %{url}'
224
224
  social_handlers: sociaal
225
225
  title: Algemene informatie
226
226
  visbility: Zichtbaarheid
227
227
  assembly_copies:
228
228
  form:
229
- slug_help: 'URL-slugs worden gebruikt om de URL''s te genereren die naar deze bijeenkomst verwijzen. Enkel letters, cijfers en streepjes worden toegestaan en deze moet beginnen met een letter. Voorbeeld: %{url}'
229
+ slug_help: 'URL-paden worden gebruikt om de URL''s te genereren die naar deze bijeenkomst verwijzen. Enkel letters, cijfers en streepjes worden toegestaan en deze moet beginnen met een letter. Voorbeeld: %{url}'
230
230
  assembly_members:
231
231
  form:
232
232
  existing_user: Bestaande deelnemer
@@ -253,7 +253,7 @@ nl:
253
253
  executive: Uitvoerend
254
254
  government: Regering
255
255
  others: Overige
256
- participatory: deelnemende
256
+ participatory: Participatief
257
257
  working_group: Werkgroep
258
258
  content_blocks:
259
259
  highlighted_assemblies:
@@ -263,7 +263,7 @@ nl:
263
263
  others: Overige
264
264
  public: Openbaar
265
265
  filter:
266
- all: Alle soorten groepen
266
+ all: Alle types
267
267
  commission: Commissie
268
268
  consultative_advisory: Adviesgroep
269
269
  executive: Uitvoerend
@@ -293,8 +293,8 @@ nl:
293
293
  created_by: Aangemaakt door
294
294
  creation_date: Gemaakt op
295
295
  developer_group: Promotergroep
296
- duration: Looptijd
297
- included_at: Inbegrepen bij
296
+ duration: Duur
297
+ included_at: Opgenomen op
298
298
  indefinite_duration: onbepaald
299
299
  internal_organisation: Interne organisatie
300
300
  is_transparent:
@@ -304,10 +304,10 @@ nl:
304
304
  participatory_scope: Wat wordt besloten
305
305
  participatory_structure: Hoe wordt er besloten
306
306
  private_space: Dit is een privé event
307
- purpose_of_action: Doel van actie
307
+ purpose_of_action: Doelstelling
308
308
  read_less: Minder lezen
309
309
  read_more: Lees verder
310
- related_participatory_processes: Verwante burgerinspraken
310
+ related_participatory_processes: Verwante inspraakprocessen
311
311
  scope: Scope
312
312
  social_networks: Sociale netwerken
313
313
  target: Wie doet mee
@@ -361,7 +361,7 @@ nl:
361
361
  index:
362
362
  children: 'Groepen: '
363
363
  organizational_chart: Organisatieschema
364
- promoted_assemblies: Uitgelichte events
364
+ promoted_assemblies: Uitgelichte groepen
365
365
  reset_chart: Reset
366
366
  order_by_assemblies:
367
367
  assemblies:
@@ -269,7 +269,6 @@ pl:
269
269
  others: Inni
270
270
  public: Publiczny
271
271
  filter:
272
- all: Wszystkie rodzaje złożeń
273
272
  commission: Komisja
274
273
  consultative_advisory: Konsultacyjne / doradcze
275
274
  executive: Wykonawczy
@@ -263,7 +263,6 @@ pt-BR:
263
263
  others: Outras
264
264
  public: Público
265
265
  filter:
266
- all: Todos os tipos de montagens
267
266
  commission: Comissão
268
267
  consultative_advisory: Consultivo / Consultivo
269
268
  executive: Executivo
@@ -263,7 +263,6 @@ pt:
263
263
  others: Outras
264
264
  public: Público
265
265
  filter:
266
- all: Todos os tipos de montagens
267
266
  commission: Comissão
268
267
  consultative_advisory: Consultivo / Consultivo
269
268
  executive: Executivo
@@ -263,7 +263,6 @@ sv:
263
263
  others: Övriga
264
264
  public: Offentligt
265
265
  filter:
266
- all: Alla typer av församlingar
267
266
  commission: Kommission
268
267
  consultative_advisory: Rådgivande
269
268
  executive: Verkställande
@@ -263,7 +263,6 @@ tr:
263
263
  others: Diğerleri
264
264
  public: halka açık
265
265
  filter:
266
- all: Her tür montaj
267
266
  commission: komisyon
268
267
  consultative_advisory: Danışma / Danışma
269
268
  executive: yönetici
@@ -54,6 +54,9 @@ module Decidim
54
54
  member do
55
55
  post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
56
56
  end
57
+ collection do
58
+ resource :participatory_space_private_users_csv_import, only: [:new, :create], path: "csv_import"
59
+ end
57
60
  end
58
61
  end
59
62
 
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-assemblies version.
5
5
  module Assemblies
6
6
  def self.version
7
- "0.18.1"
7
+ "0.19.0"
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-assemblies
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -18,42 +18,42 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.18.1
21
+ version: 0.19.0
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.18.1
28
+ version: 0.19.0
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-admin
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.18.1
35
+ version: 0.19.0
36
36
  type: :development
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.18.1
42
+ version: 0.19.0
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: decidim-dev
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.18.1
49
+ version: 0.19.0
50
50
  type: :development
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.18.1
56
+ version: 0.19.0
57
57
  description: Assemblies component for decidim.
58
58
  email:
59
59
  - josepjaume@gmail.com
@@ -111,6 +111,7 @@ files:
111
111
  - app/controllers/decidim/assemblies/admin/exports_controller.rb
112
112
  - app/controllers/decidim/assemblies/admin/moderations_controller.rb
113
113
  - app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
114
+ - app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
114
115
  - app/controllers/decidim/assemblies/application_controller.rb
115
116
  - app/controllers/decidim/assemblies/assemblies_controller.rb
116
117
  - app/controllers/decidim/assemblies/assembly_members_controller.rb