decidim-assemblies 0.25.0 → 0.26.0.rc2
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/assemblies/assembly_member/show.erb +1 -1
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +12 -0
- data/app/commands/decidim/assemblies/admin/copy_assembly.rb +2 -1
- data/app/commands/decidim/assemblies/admin/create_assembly_member.rb +39 -18
- data/app/commands/decidim/assemblies/admin/update_assembly_member.rb +37 -16
- data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb +20 -0
- data/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb +1 -0
- data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb +11 -3
- data/app/forms/decidim/assemblies/admin/assembly_member_form.rb +15 -2
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +1 -1
- data/app/models/decidim/assembly.rb +0 -15
- data/app/models/decidim/assembly_member.rb +10 -0
- data/app/models/decidim/assembly_user_role.rb +20 -0
- data/app/packs/src/decidim/assemblies/admin/assembly_members.js +10 -0
- data/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb +0 -1
- data/app/presenters/decidim/assembly_member_presenter.rb +10 -0
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb +4 -4
- data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +7 -6
- data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/show.html.erb +6 -6
- data/app/views/decidim/assemblies/assembly_members/index.html.erb +9 -0
- data/app/views/layouts/decidim/admin/assembly_members.html.erb +18 -0
- data/config/locales/ar.yml +0 -1
- data/config/locales/ca.yml +7 -1
- data/config/locales/cs.yml +7 -1
- data/config/locales/de.yml +0 -1
- data/config/locales/el.yml +0 -1
- data/config/locales/en.yml +7 -1
- data/config/locales/es-MX.yml +7 -1
- data/config/locales/es-PY.yml +7 -1
- data/config/locales/es.yml +7 -1
- data/config/locales/eu.yml +8 -2
- data/config/locales/fi-plain.yml +7 -1
- data/config/locales/fi.yml +7 -1
- data/config/locales/fr-CA.yml +7 -1
- data/config/locales/fr.yml +10 -4
- data/config/locales/gl.yml +7 -1
- data/config/locales/hu.yml +0 -1
- data/config/locales/id-ID.yml +0 -1
- data/config/locales/is-IS.yml +0 -1
- data/config/locales/it.yml +7 -1
- data/config/locales/ja.yml +22 -16
- data/config/locales/lb-LU.yml +396 -0
- data/config/locales/lb.yml +1 -1
- data/config/locales/lv.yml +0 -1
- data/config/locales/nl.yml +7 -1
- data/config/locales/no.yml +0 -1
- data/config/locales/pl.yml +4 -1
- data/config/locales/pt-BR.yml +1 -2
- data/config/locales/pt.yml +7 -1
- data/config/locales/ro-RO.yml +174 -168
- data/config/locales/ru.yml +0 -1
- data/config/locales/sk.yml +0 -1
- data/config/locales/sl.yml +0 -1
- data/config/locales/sv.yml +7 -1
- data/config/locales/tr-TR.yml +0 -1
- data/config/locales/uk.yml +0 -1
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/zh-CN.yml +0 -1
- data/db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb +7 -0
- data/lib/decidim/api/assembly_member_type.rb +0 -1
- data/lib/decidim/assemblies/admin_engine.rb +3 -1
- data/lib/decidim/assemblies/engine.rb +4 -0
- data/lib/decidim/assemblies/participatory_space.rb +1 -3
- data/lib/decidim/assemblies/test/factories.rb +0 -1
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +17 -14
data/config/locales/sv.yml
CHANGED
@@ -59,9 +59,9 @@ sv:
|
|
59
59
|
birthplace: Födelseort
|
60
60
|
ceased_date: Slutade datum
|
61
61
|
designation_date: Utnämningsdatum
|
62
|
-
designation_mode: Utnämningsläge
|
63
62
|
full_name: Fullständigt namn
|
64
63
|
gender: Kön
|
64
|
+
non_user_avatar: Profilbild
|
65
65
|
position: Befattning
|
66
66
|
user_id: Användare
|
67
67
|
assembly_user_role:
|
@@ -182,6 +182,9 @@ sv:
|
|
182
182
|
update:
|
183
183
|
error: Det gick inte att uppdatera en administratör för gruppen.
|
184
184
|
success: Administratören för gruppen har uppdaterats.
|
185
|
+
filters:
|
186
|
+
decidim_assemblies_type_id_eq:
|
187
|
+
label: Typ av grupp
|
185
188
|
menu:
|
186
189
|
assemblies: Grupper
|
187
190
|
assemblies_settings: Inställningar
|
@@ -296,7 +299,10 @@ sv:
|
|
296
299
|
assembly_members:
|
297
300
|
form:
|
298
301
|
existing_user: Befintlig deltagare
|
302
|
+
explanation: 'Vägledning för bild:'
|
303
|
+
image_guide: Helst en porträttbild utan text.
|
299
304
|
non_user: Ej deltagande
|
305
|
+
non_user_avatar_help: Du bör få samtycke av personerna innan du publicerar dem som medlem.
|
300
306
|
select_a_position: Välj en position
|
301
307
|
select_user: Välj en deltagare
|
302
308
|
user_type: Typ av deltagare
|
data/config/locales/tr-TR.yml
CHANGED
data/config/locales/uk.yml
CHANGED
@@ -0,0 +1 @@
|
|
1
|
+
val:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -20,7 +20,6 @@ module Decidim
|
|
20
20
|
# field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
|
21
21
|
field :birthplace, GraphQL::Types::String, "Birthplace of the member", null: true
|
22
22
|
field :designation_date, Decidim::Core::DateType, "Date of designation of the member", null: true
|
23
|
-
# field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
|
24
23
|
field :position_other, GraphQL::Types::String, "Custom position name", null: true
|
25
24
|
field :ceased_date, Decidim::Core::DateType, "Date of cease for the member", null: true
|
26
25
|
end
|
@@ -110,6 +110,10 @@ module Decidim
|
|
110
110
|
initializer "decidim_assemblies.query_extensions" do
|
111
111
|
Decidim::Api::QueryType.include Decidim::Assemblies::QueryExtensions
|
112
112
|
end
|
113
|
+
|
114
|
+
initializer "decidim_assemblies.webpacker.assets_path" do
|
115
|
+
Decidim.register_assets_path File.expand_path("app/packs", root)
|
116
|
+
end
|
113
117
|
end
|
114
118
|
end
|
115
119
|
end
|
@@ -30,7 +30,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
30
30
|
|
31
31
|
participatory_space.exports :assemblies do |export|
|
32
32
|
export.collection do |assembly|
|
33
|
-
Decidim::Assembly.where(id: assembly.id)
|
33
|
+
Decidim::Assembly.where(id: assembly.id).includes(:area, :scope, :attachment_collections, :categories)
|
34
34
|
end
|
35
35
|
|
36
36
|
export.serializer Decidim::Assemblies::AssemblySerializer
|
@@ -248,7 +248,6 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
248
248
|
birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
|
249
249
|
birthplace: Faker::Demographic.demonym,
|
250
250
|
designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
|
251
|
-
designation_mode: Faker::Lorem.word,
|
252
251
|
position: position,
|
253
252
|
position_other: position == "other" ? Faker::Job.position : nil,
|
254
253
|
assembly: current_assembly
|
@@ -261,7 +260,6 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
261
260
|
birthday: Faker::Date.birthday(min_age: 18, max_age: 65),
|
262
261
|
birthplace: Faker::Demographic.demonym,
|
263
262
|
designation_date: Faker::Date.between(from: 1.year.ago, to: 1.month.ago),
|
264
|
-
designation_mode: Faker::Lorem.word,
|
265
263
|
position: "other",
|
266
264
|
position_other: Faker::Job.position,
|
267
265
|
assembly: current_assembly
|
@@ -168,7 +168,6 @@ FactoryBot.define do
|
|
168
168
|
birthplace { Faker::Lorem.word }
|
169
169
|
position { Decidim::AssemblyMember::POSITIONS.first }
|
170
170
|
designation_date { Faker::Date.between(from: 1.year.ago, to: 1.month.ago) }
|
171
|
-
designation_mode { Faker::Lorem.word }
|
172
171
|
|
173
172
|
trait :ceased do
|
174
173
|
ceased_date { Faker::Date.between(from: 1.day.ago, to: 5.days.ago) }
|
metadata
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-assemblies
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.26.0.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
8
8
|
- Marc Riera Casals
|
9
9
|
- Oriol Gual Oliva
|
10
|
-
autorequire:
|
10
|
+
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2022-02-02 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-core
|
@@ -18,42 +18,42 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.
|
21
|
+
version: 0.26.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.
|
28
|
+
version: 0.26.0.rc2
|
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.
|
35
|
+
version: 0.26.0.rc2
|
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.
|
42
|
+
version: 0.26.0.rc2
|
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.
|
49
|
+
version: 0.26.0.rc2
|
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.
|
56
|
+
version: 0.26.0.rc2
|
57
57
|
description: Assemblies component for decidim.
|
58
58
|
email:
|
59
59
|
- josepjaume@gmail.com
|
@@ -218,6 +218,7 @@ files:
|
|
218
218
|
- app/views/layouts/decidim/_assembly_navigation.html.erb
|
219
219
|
- app/views/layouts/decidim/admin/assemblies.html.erb
|
220
220
|
- app/views/layouts/decidim/admin/assembly.html.erb
|
221
|
+
- app/views/layouts/decidim/admin/assembly_members.html.erb
|
221
222
|
- app/views/layouts/decidim/assembly.html.erb
|
222
223
|
- config/assets.rb
|
223
224
|
- config/locales/am-ET.yml
|
@@ -286,6 +287,7 @@ files:
|
|
286
287
|
- config/locales/ti-ER.yml
|
287
288
|
- config/locales/tr-TR.yml
|
288
289
|
- config/locales/uk.yml
|
290
|
+
- config/locales/val-ES.yml
|
289
291
|
- config/locales/vi-VN.yml
|
290
292
|
- config/locales/vi.yml
|
291
293
|
- config/locales/zh-CN.yml
|
@@ -311,6 +313,7 @@ files:
|
|
311
313
|
- db/migrate/20210204152393_add_weight_field_to_assembly.rb
|
312
314
|
- db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
|
313
315
|
- db/migrate/20210507063604_add_announcement_to_assemblies.rb
|
316
|
+
- db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb
|
314
317
|
- db/seeds/Exampledocument.pdf
|
315
318
|
- db/seeds/city.jpeg
|
316
319
|
- db/seeds/city2.jpeg
|
@@ -331,7 +334,7 @@ homepage: https://github.com/decidim/decidim
|
|
331
334
|
licenses:
|
332
335
|
- AGPL-3.0
|
333
336
|
metadata: {}
|
334
|
-
post_install_message:
|
337
|
+
post_install_message:
|
335
338
|
rdoc_options: []
|
336
339
|
require_paths:
|
337
340
|
- lib
|
@@ -342,12 +345,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
342
345
|
version: '2.7'
|
343
346
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
344
347
|
requirements:
|
345
|
-
- - "
|
348
|
+
- - ">"
|
346
349
|
- !ruby/object:Gem::Version
|
347
|
-
version:
|
350
|
+
version: 1.3.1
|
348
351
|
requirements: []
|
349
|
-
rubygems_version: 3.1.
|
350
|
-
signing_key:
|
352
|
+
rubygems_version: 3.1.6
|
353
|
+
signing_key:
|
351
354
|
specification_version: 4
|
352
355
|
summary: Decidim assemblies module
|
353
356
|
test_files: []
|