decidim-assemblies 0.31.5 → 0.32.0.rc2
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.
- checksums.yaml +4 -4
- data/README.md +4 -12
- data/app/cells/decidim/assemblies/content_blocks/main_data_cell.rb +1 -0
- data/app/commands/decidim/assemblies/admin/create_assembly.rb +4 -4
- data/app/commands/decidim/assemblies/admin/duplicate_assembly.rb +1 -2
- data/app/commands/decidim/assemblies/admin/update_assembly.rb +3 -3
- data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb +6 -2
- data/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb +0 -3
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +2 -2
- data/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb +1 -1
- data/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb +1 -1
- data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb +1 -0
- data/app/controllers/decidim/assemblies/admin/members_controller.rb +14 -0
- data/app/controllers/decidim/assemblies/admin/members_csv_imports_controller.rb +22 -0
- data/app/controllers/decidim/assemblies/{participatory_space_private_users_controller.rb → members_controller.rb} +2 -2
- data/app/forms/decidim/assemblies/admin/assembly_form.rb +9 -6
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +2 -2
- data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb +2 -1
- data/app/models/decidim/assembly.rb +12 -15
- data/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js +1 -130
- data/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js +0 -28
- data/app/permissions/decidim/assemblies/permissions.rb +9 -9
- data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +1 -2
- data/app/presenters/decidim/assemblies/assembly_presenter.rb +0 -4
- data/app/queries/decidim/assemblies/admin/admin_users.rb +1 -1
- data/app/serializers/decidim/assemblies/assembly_importer.rb +10 -13
- data/app/serializers/decidim/assemblies/assembly_serializer.rb +1 -1
- data/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb +2 -8
- data/app/views/decidim/assemblies/admin/assemblies/_assemblies_thead.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb +5 -6
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +33 -17
- data/app/views/decidim/assemblies/admin/assemblies/edit.html.erb +3 -2
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +2 -1
- data/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assemblies/new.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb +2 -2
- data/app/views/decidim/assemblies/assemblies/show.html.erb +9 -3
- data/app/views/decidim/assemblies/members/index.html.erb +24 -0
- data/config/locales/ar.yml +0 -25
- data/config/locales/bg.yml +0 -25
- data/config/locales/bs-BA.yml +0 -7
- data/config/locales/ca-IT.yml +36 -34
- data/config/locales/ca.yml +36 -34
- data/config/locales/cs.yml +36 -34
- data/config/locales/de.yml +25 -33
- data/config/locales/el.yml +0 -25
- data/config/locales/en.yml +36 -34
- data/config/locales/es-MX.yml +36 -34
- data/config/locales/es-PY.yml +36 -34
- data/config/locales/es.yml +36 -34
- data/config/locales/eu.yml +36 -34
- data/config/locales/fi-plain.yml +36 -34
- data/config/locales/fi.yml +36 -34
- data/config/locales/fr-CA.yml +34 -34
- data/config/locales/fr.yml +34 -34
- data/config/locales/ga-IE.yml +0 -11
- data/config/locales/gl.yml +0 -23
- data/config/locales/he-IL.yml +0 -10
- data/config/locales/hu.yml +0 -25
- data/config/locales/id-ID.yml +0 -21
- data/config/locales/is-IS.yml +0 -8
- data/config/locales/it.yml +0 -27
- data/config/locales/ja.yml +23 -34
- data/config/locales/ko.yml +0 -8
- data/config/locales/lb.yml +0 -23
- data/config/locales/lt.yml +0 -24
- data/config/locales/lv.yml +0 -24
- data/config/locales/nl.yml +0 -25
- data/config/locales/no.yml +0 -25
- data/config/locales/pl.yml +0 -25
- data/config/locales/pt-BR.yml +4 -27
- data/config/locales/pt.yml +0 -27
- data/config/locales/ro-RO.yml +2 -24
- data/config/locales/ru.yml +0 -14
- data/config/locales/sk.yml +36 -34
- data/config/locales/sl.yml +0 -10
- data/config/locales/sq-AL.yml +0 -16
- data/config/locales/sr-CS.yml +0 -7
- data/config/locales/sv.yml +16 -28
- data/config/locales/tr-TR.yml +0 -25
- data/config/locales/uk.yml +0 -14
- data/config/locales/zh-CN.yml +0 -24
- data/config/locales/zh-TW.yml +0 -25
- data/db/data/20260104094930_remove_assemblies_types_references.rb +25 -0
- data/db/data/20260111185230_replace_legacy_fields_to_access_mode_for_assemblies.rb +25 -0
- data/db/data/20260210195653_move_announcement_to_content_block_on_assemblies.rb +40 -0
- data/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb +4 -4
- data/db/migrate/20190215093700_reset_negative_children_count_counters.rb +6 -2
- data/db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb +6 -2
- data/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb +8 -0
- data/db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb +7 -0
- data/db/migrate/20260104093601_remove_assemblies_types.rb +12 -0
- data/db/migrate/20260111120000_add_access_mode_to_assemblies.rb +11 -0
- data/decidim-assemblies.gemspec +8 -9
- data/lib/decidim/api/assembly_type.rb +1 -8
- data/lib/decidim/assemblies/admin_engine.rb +10 -4
- data/lib/decidim/assemblies/content_blocks/registry_manager.rb +5 -0
- data/lib/decidim/assemblies/engine.rb +26 -42
- data/lib/decidim/assemblies/menu.rb +5 -5
- data/lib/decidim/assemblies/participatory_space.rb +0 -2
- data/lib/decidim/assemblies/seeds.rb +1 -2
- data/lib/decidim/assemblies/test/factories.rb +8 -20
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +25 -30
- data/app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb +0 -19
- data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb +0 -17
- data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb +0 -13
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb +0 -22
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb +0 -22
- data/app/forms/decidim/assemblies/admin/assemblies_type_form.rb +0 -17
- data/app/models/decidim/assemblies_type.rb +0 -27
- data/app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb +0 -43
- data/app/presenters/decidim/log/value_types/assembly_type_presenter.rb +0 -29
- data/app/queries/decidim/assemblies/filtered_assemblies.rb +0 -22
- data/app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb +0 -9
- data/app/views/decidim/assemblies/participatory_space_private_users/index.html.erb +0 -23
|
@@ -8,14 +8,6 @@ FactoryBot.define do
|
|
|
8
8
|
"#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
|
|
9
9
|
end
|
|
10
10
|
|
|
11
|
-
factory :assemblies_type, class: "Decidim::AssembliesType" do
|
|
12
|
-
transient do
|
|
13
|
-
skip_injection { false }
|
|
14
|
-
end
|
|
15
|
-
title { generate_localized_title(:assemblies_type_title, skip_injection:) }
|
|
16
|
-
organization
|
|
17
|
-
end
|
|
18
|
-
|
|
19
11
|
factory :assembly, class: "Decidim::Assembly" do
|
|
20
12
|
transient do
|
|
21
13
|
skip_injection { false }
|
|
@@ -27,7 +19,6 @@ FactoryBot.define do
|
|
|
27
19
|
description { generate_localized_description(:assembly_description, skip_injection:) }
|
|
28
20
|
organization
|
|
29
21
|
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
|
|
30
|
-
banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
|
|
31
22
|
published_at { Time.current }
|
|
32
23
|
deleted_at { nil }
|
|
33
24
|
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
|
|
@@ -36,7 +27,7 @@ FactoryBot.define do
|
|
|
36
27
|
target { generate_localized_title(:assembly_target, skip_injection:) }
|
|
37
28
|
participatory_scope { generate_localized_title(:assembly_participatory_scope, skip_injection:) }
|
|
38
29
|
participatory_structure { generate_localized_title(:assembly_participatory_structure, skip_injection:) }
|
|
39
|
-
|
|
30
|
+
has_members { false }
|
|
40
31
|
purpose_of_action { generate_localized_description(:assembly_purpose_of_action, skip_injection:) }
|
|
41
32
|
composition { generate_localized_description(:assembly_composition, skip_injection:) }
|
|
42
33
|
creation_date { 1.month.ago }
|
|
@@ -47,7 +38,6 @@ FactoryBot.define do
|
|
|
47
38
|
closing_date { 2.months.from_now.at_midnight }
|
|
48
39
|
closing_date_reason { generate_localized_description(:assembly_closing_date_reason, skip_injection:) }
|
|
49
40
|
internal_organisation { generate_localized_description(:assembly_internal_organisation, skip_injection:) }
|
|
50
|
-
is_transparent { true }
|
|
51
41
|
special_features { generate_localized_description(:assembly_special_features, skip_injection:) }
|
|
52
42
|
twitter_handler { "others" }
|
|
53
43
|
facebook_handler { "others" }
|
|
@@ -77,20 +67,18 @@ FactoryBot.define do
|
|
|
77
67
|
parent { create(:assembly, organization:, skip_injection:) }
|
|
78
68
|
end
|
|
79
69
|
|
|
80
|
-
trait :
|
|
81
|
-
|
|
82
|
-
end
|
|
83
|
-
|
|
84
|
-
trait :private do
|
|
85
|
-
private_space { true }
|
|
70
|
+
trait :open do
|
|
71
|
+
access_mode { :open }
|
|
86
72
|
end
|
|
87
73
|
|
|
88
74
|
trait :transparent do
|
|
89
|
-
|
|
75
|
+
has_members { true }
|
|
76
|
+
access_mode { :transparent }
|
|
90
77
|
end
|
|
91
78
|
|
|
92
|
-
trait :
|
|
93
|
-
|
|
79
|
+
trait :restricted do
|
|
80
|
+
has_members { true }
|
|
81
|
+
access_mode { :restricted }
|
|
94
82
|
end
|
|
95
83
|
|
|
96
84
|
trait :with_content_blocks do
|
metadata
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-assemblies
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.32.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:
|
|
11
10
|
bindir: bin
|
|
12
11
|
cert_chain: []
|
|
13
|
-
date:
|
|
12
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
14
13
|
dependencies:
|
|
15
14
|
- !ruby/object:Gem::Dependency
|
|
16
15
|
name: decidim-core
|
|
@@ -18,70 +17,70 @@ dependencies:
|
|
|
18
17
|
requirements:
|
|
19
18
|
- - '='
|
|
20
19
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: 0.
|
|
20
|
+
version: 0.32.0.rc2
|
|
22
21
|
type: :runtime
|
|
23
22
|
prerelease: false
|
|
24
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
24
|
requirements:
|
|
26
25
|
- - '='
|
|
27
26
|
- !ruby/object:Gem::Version
|
|
28
|
-
version: 0.
|
|
27
|
+
version: 0.32.0.rc2
|
|
29
28
|
- !ruby/object:Gem::Dependency
|
|
30
29
|
name: decidim-admin
|
|
31
30
|
requirement: !ruby/object:Gem::Requirement
|
|
32
31
|
requirements:
|
|
33
32
|
- - '='
|
|
34
33
|
- !ruby/object:Gem::Version
|
|
35
|
-
version: 0.
|
|
34
|
+
version: 0.32.0.rc2
|
|
36
35
|
type: :development
|
|
37
36
|
prerelease: false
|
|
38
37
|
version_requirements: !ruby/object:Gem::Requirement
|
|
39
38
|
requirements:
|
|
40
39
|
- - '='
|
|
41
40
|
- !ruby/object:Gem::Version
|
|
42
|
-
version: 0.
|
|
41
|
+
version: 0.32.0.rc2
|
|
43
42
|
- !ruby/object:Gem::Dependency
|
|
44
43
|
name: decidim-dev
|
|
45
44
|
requirement: !ruby/object:Gem::Requirement
|
|
46
45
|
requirements:
|
|
47
46
|
- - '='
|
|
48
47
|
- !ruby/object:Gem::Version
|
|
49
|
-
version: 0.
|
|
48
|
+
version: 0.32.0.rc2
|
|
50
49
|
type: :development
|
|
51
50
|
prerelease: false
|
|
52
51
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
52
|
requirements:
|
|
54
53
|
- - '='
|
|
55
54
|
- !ruby/object:Gem::Version
|
|
56
|
-
version: 0.
|
|
55
|
+
version: 0.32.0.rc2
|
|
57
56
|
- !ruby/object:Gem::Dependency
|
|
58
57
|
name: decidim-meetings
|
|
59
58
|
requirement: !ruby/object:Gem::Requirement
|
|
60
59
|
requirements:
|
|
61
60
|
- - '='
|
|
62
61
|
- !ruby/object:Gem::Version
|
|
63
|
-
version: 0.
|
|
62
|
+
version: 0.32.0.rc2
|
|
64
63
|
type: :development
|
|
65
64
|
prerelease: false
|
|
66
65
|
version_requirements: !ruby/object:Gem::Requirement
|
|
67
66
|
requirements:
|
|
68
67
|
- - '='
|
|
69
68
|
- !ruby/object:Gem::Version
|
|
70
|
-
version: 0.
|
|
69
|
+
version: 0.32.0.rc2
|
|
71
70
|
- !ruby/object:Gem::Dependency
|
|
72
71
|
name: decidim-proposals
|
|
73
72
|
requirement: !ruby/object:Gem::Requirement
|
|
74
73
|
requirements:
|
|
75
74
|
- - '='
|
|
76
75
|
- !ruby/object:Gem::Version
|
|
77
|
-
version: 0.
|
|
76
|
+
version: 0.32.0.rc2
|
|
78
77
|
type: :development
|
|
79
78
|
prerelease: false
|
|
80
79
|
version_requirements: !ruby/object:Gem::Requirement
|
|
81
80
|
requirements:
|
|
82
81
|
- - '='
|
|
83
82
|
- !ruby/object:Gem::Version
|
|
84
|
-
version: 0.
|
|
83
|
+
version: 0.32.0.rc2
|
|
85
84
|
description: Assemblies component for decidim.
|
|
86
85
|
email:
|
|
87
86
|
- josepjaume@gmail.com
|
|
@@ -96,7 +95,6 @@ files:
|
|
|
96
95
|
- app/cells/decidim/assemblies/assemblies/show.erb
|
|
97
96
|
- app/cells/decidim/assemblies/assemblies_cell.rb
|
|
98
97
|
- app/cells/decidim/assemblies/assembly_cell.rb
|
|
99
|
-
- app/cells/decidim/assemblies/assembly_dropdown_metadata_cell.rb
|
|
100
98
|
- app/cells/decidim/assemblies/assembly_g_cell.rb
|
|
101
99
|
- app/cells/decidim/assemblies/assembly_metadata_g_cell.rb
|
|
102
100
|
- app/cells/decidim/assemblies/assembly_s_cell.rb
|
|
@@ -113,11 +111,9 @@ files:
|
|
|
113
111
|
- app/cells/decidim/assemblies/content_blocks/related_assemblies_cell.rb
|
|
114
112
|
- app/cells/decidim/assemblies/content_blocks/stats_cell.rb
|
|
115
113
|
- app/cells/decidim/assembly_activity_cell.rb
|
|
116
|
-
- app/commands/decidim/assemblies/admin/create_assemblies_type.rb
|
|
117
114
|
- app/commands/decidim/assemblies/admin/create_assembly.rb
|
|
118
115
|
- app/commands/decidim/assemblies/admin/duplicate_assembly.rb
|
|
119
116
|
- app/commands/decidim/assemblies/admin/import_assembly.rb
|
|
120
|
-
- app/commands/decidim/assemblies/admin/update_assemblies_type.rb
|
|
121
117
|
- app/commands/decidim/assemblies/admin/update_assembly.rb
|
|
122
118
|
- app/constraints/decidim/assemblies/current_assembly.rb
|
|
123
119
|
- app/constraints/decidim/assemblies/current_component.rb
|
|
@@ -142,16 +138,15 @@ files:
|
|
|
142
138
|
- app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
|
|
143
139
|
- app/controllers/decidim/assemblies/admin/exports_controller.rb
|
|
144
140
|
- app/controllers/decidim/assemblies/admin/imports_controller.rb
|
|
141
|
+
- app/controllers/decidim/assemblies/admin/members_controller.rb
|
|
142
|
+
- app/controllers/decidim/assemblies/admin/members_csv_imports_controller.rb
|
|
145
143
|
- app/controllers/decidim/assemblies/admin/moderations/reports_controller.rb
|
|
146
144
|
- app/controllers/decidim/assemblies/admin/moderations_controller.rb
|
|
147
|
-
- app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
|
|
148
|
-
- app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
|
|
149
145
|
- app/controllers/decidim/assemblies/admin/reminders_controller.rb
|
|
150
146
|
- app/controllers/decidim/assemblies/application_controller.rb
|
|
151
147
|
- app/controllers/decidim/assemblies/assemblies_controller.rb
|
|
152
|
-
- app/controllers/decidim/assemblies/
|
|
148
|
+
- app/controllers/decidim/assemblies/members_controller.rb
|
|
153
149
|
- app/events/decidim/role_assigned_to_assembly_event.rb
|
|
154
|
-
- app/forms/decidim/assemblies/admin/assemblies_type_form.rb
|
|
155
150
|
- app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
|
|
156
151
|
- app/forms/decidim/assemblies/admin/assembly_form.rb
|
|
157
152
|
- app/forms/decidim/assemblies/admin/assembly_import_form.rb
|
|
@@ -161,7 +156,6 @@ files:
|
|
|
161
156
|
- app/helpers/decidim/assemblies/application_helper.rb
|
|
162
157
|
- app/helpers/decidim/assemblies/assemblies_helper.rb
|
|
163
158
|
- app/helpers/decidim/assemblies/filter_assemblies_helper.rb
|
|
164
|
-
- app/models/decidim/assemblies_type.rb
|
|
165
159
|
- app/models/decidim/assembly.rb
|
|
166
160
|
- app/models/decidim/assembly_user_role.rb
|
|
167
161
|
- app/packs/entrypoints/decidim_assemblies_admin.js
|
|
@@ -174,7 +168,6 @@ files:
|
|
|
174
168
|
- app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
|
|
175
169
|
- app/permissions/decidim/assemblies/permissions.rb
|
|
176
170
|
- app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
|
|
177
|
-
- app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
|
|
178
171
|
- app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
|
|
179
172
|
- app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
|
|
180
173
|
- app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
|
|
@@ -182,12 +175,10 @@ files:
|
|
|
182
175
|
- app/presenters/decidim/assemblies/assembly_stats_presenter.rb
|
|
183
176
|
- app/presenters/decidim/assembly_presenter.rb
|
|
184
177
|
- app/presenters/decidim/log/value_types/assembly_presenter.rb
|
|
185
|
-
- app/presenters/decidim/log/value_types/assembly_type_presenter.rb
|
|
186
178
|
- app/queries/decidim/assemblies/admin/admin_users.rb
|
|
187
179
|
- app/queries/decidim/assemblies/assemblies_stats_followers_count.rb
|
|
188
180
|
- app/queries/decidim/assemblies/assemblies_stats_participants_count.rb
|
|
189
181
|
- app/queries/decidim/assemblies/assemblies_with_user_role.rb
|
|
190
|
-
- app/queries/decidim/assemblies/filtered_assemblies.rb
|
|
191
182
|
- app/queries/decidim/assemblies/organization_assemblies.rb
|
|
192
183
|
- app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
|
|
193
184
|
- app/queries/decidim/assemblies/organization_published_assemblies.rb
|
|
@@ -221,8 +212,7 @@ files:
|
|
|
221
212
|
- app/views/decidim/assemblies/assemblies/index.html.erb
|
|
222
213
|
- app/views/decidim/assemblies/assemblies/index.js.erb
|
|
223
214
|
- app/views/decidim/assemblies/assemblies/show.html.erb
|
|
224
|
-
- app/views/decidim/assemblies/
|
|
225
|
-
- app/views/decidim/assemblies/participatory_space_private_users/index.html.erb
|
|
215
|
+
- app/views/decidim/assemblies/members/index.html.erb
|
|
226
216
|
- app/views/layouts/decidim/admin/_manage_assemblies.html.erb
|
|
227
217
|
- app/views/layouts/decidim/admin/assemblies.html.erb
|
|
228
218
|
- app/views/layouts/decidim/admin/assemblies_imports.html.erb
|
|
@@ -311,6 +301,9 @@ files:
|
|
|
311
301
|
- config/locales/vi.yml
|
|
312
302
|
- config/locales/zh-CN.yml
|
|
313
303
|
- config/locales/zh-TW.yml
|
|
304
|
+
- db/data/20260104094930_remove_assemblies_types_references.rb
|
|
305
|
+
- db/data/20260111185230_replace_legacy_fields_to_access_mode_for_assemblies.rb
|
|
306
|
+
- db/data/20260210195653_move_announcement_to_content_block_on_assemblies.rb
|
|
314
307
|
- db/migrate/20170727190859_add_assemblies.rb
|
|
315
308
|
- db/migrate/20170822153055_add_scopes_enabled_to_assemblies.rb
|
|
316
309
|
- db/migrate/20180109105917_add_assembly_user_roles.rb
|
|
@@ -338,6 +331,10 @@ files:
|
|
|
338
331
|
- db/migrate/20241016101151_migrate_assembly_members_to_private_users.rb
|
|
339
332
|
- db/migrate/20241108141651_remove_column_show_statistics_from_assemblies.rb
|
|
340
333
|
- db/migrate/20250604081741_remove_hastags_column_assemblies.rb
|
|
334
|
+
- db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb
|
|
335
|
+
- db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb
|
|
336
|
+
- db/migrate/20260104093601_remove_assemblies_types.rb
|
|
337
|
+
- db/migrate/20260111120000_add_access_mode_to_assemblies.rb
|
|
341
338
|
- decidim-assemblies.gemspec
|
|
342
339
|
- lib/decidim/api/assembly_type.rb
|
|
343
340
|
- lib/decidim/assemblies.rb
|
|
@@ -361,7 +358,6 @@ metadata:
|
|
|
361
358
|
funding_uri: https://opencollective.com/decidim
|
|
362
359
|
homepage_uri: https://decidim.org
|
|
363
360
|
source_code_uri: https://github.com/decidim/decidim
|
|
364
|
-
post_install_message:
|
|
365
361
|
rdoc_options: []
|
|
366
362
|
require_paths:
|
|
367
363
|
- lib
|
|
@@ -369,15 +365,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
369
365
|
requirements:
|
|
370
366
|
- - "~>"
|
|
371
367
|
- !ruby/object:Gem::Version
|
|
372
|
-
version: 3.
|
|
368
|
+
version: 3.4.0
|
|
373
369
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
374
370
|
requirements:
|
|
375
371
|
- - ">="
|
|
376
372
|
- !ruby/object:Gem::Version
|
|
377
373
|
version: '0'
|
|
378
374
|
requirements: []
|
|
379
|
-
rubygems_version: 3.
|
|
380
|
-
signing_key:
|
|
375
|
+
rubygems_version: 3.6.9
|
|
381
376
|
specification_version: 4
|
|
382
377
|
summary: Decidim assemblies module
|
|
383
378
|
test_files: []
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
class AssemblyDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
|
|
6
|
-
include AssembliesHelper
|
|
7
|
-
include Decidim::ComponentPathHelper
|
|
8
|
-
include ActiveLinkTo
|
|
9
|
-
|
|
10
|
-
def decidim_assemblies
|
|
11
|
-
Decidim::Assemblies::Engine.routes.url_helpers
|
|
12
|
-
end
|
|
13
|
-
|
|
14
|
-
private
|
|
15
|
-
|
|
16
|
-
def nav_items_method = :assembly_nav_items
|
|
17
|
-
end
|
|
18
|
-
end
|
|
19
|
-
end
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
module Admin
|
|
6
|
-
# A command with all the business logic when creating a new assembly
|
|
7
|
-
# type in the system.
|
|
8
|
-
class CreateAssembliesType < Decidim::Commands::CreateResource
|
|
9
|
-
fetch_form_attributes :title, :organization
|
|
10
|
-
|
|
11
|
-
private
|
|
12
|
-
|
|
13
|
-
def resource_class = Decidim::AssembliesType
|
|
14
|
-
end
|
|
15
|
-
end
|
|
16
|
-
end
|
|
17
|
-
end
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
module Admin
|
|
6
|
-
# A command with all the business logic when updating a new assembly
|
|
7
|
-
# type in the system.
|
|
8
|
-
class UpdateAssembliesType < Decidim::Commands::UpdateResource
|
|
9
|
-
fetch_form_attributes :title
|
|
10
|
-
end
|
|
11
|
-
end
|
|
12
|
-
end
|
|
13
|
-
end
|
data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
module Admin
|
|
6
|
-
# Controller that allows managing assembly private users
|
|
7
|
-
# on assemblies
|
|
8
|
-
class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::Admin::ApplicationController
|
|
9
|
-
include Concerns::AssemblyAdmin
|
|
10
|
-
include Decidim::Admin::Concerns::HasPrivateUsers
|
|
11
|
-
|
|
12
|
-
def after_destroy_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
|
|
@@ -1,22 +0,0 @@
|
|
|
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 assemblies
|
|
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
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
module Admin
|
|
6
|
-
# A form object used to create assembly type from the admin dashboard.
|
|
7
|
-
class AssembliesTypeForm < Form
|
|
8
|
-
include TranslatableAttributes
|
|
9
|
-
|
|
10
|
-
mimic :assemblies_type
|
|
11
|
-
|
|
12
|
-
translatable_attribute :title, String
|
|
13
|
-
validates :title, translatable_presence: true
|
|
14
|
-
end
|
|
15
|
-
end
|
|
16
|
-
end
|
|
17
|
-
end
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
# Assembly type.
|
|
5
|
-
class AssembliesType < ApplicationRecord
|
|
6
|
-
include Decidim::Traceable
|
|
7
|
-
include Decidim::Loggable
|
|
8
|
-
include Decidim::TranslatableResource
|
|
9
|
-
|
|
10
|
-
translatable_fields :title
|
|
11
|
-
|
|
12
|
-
belongs_to :organization,
|
|
13
|
-
foreign_key: "decidim_organization_id",
|
|
14
|
-
class_name: "Decidim::Organization"
|
|
15
|
-
|
|
16
|
-
has_many :assemblies,
|
|
17
|
-
foreign_key: "decidim_assemblies_type_id",
|
|
18
|
-
class_name: "Decidim::Assembly",
|
|
19
|
-
dependent: :nullify
|
|
20
|
-
|
|
21
|
-
validates :title, presence: true
|
|
22
|
-
|
|
23
|
-
def self.log_presenter_class_for(_log)
|
|
24
|
-
Decidim::Assemblies::AdminLog::AssembliesTypePresenter
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
end
|
|
@@ -1,43 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
module AdminLog
|
|
6
|
-
# This class holds the logic to present a `Decidim::AssembliesType`
|
|
7
|
-
# for the `AdminLog` log.
|
|
8
|
-
#
|
|
9
|
-
# Usage should be automatic and you should not need to call this class
|
|
10
|
-
# directly, but here is an example:
|
|
11
|
-
#
|
|
12
|
-
# action_log = Decidim::ActionLog.last
|
|
13
|
-
# view_helpers # => this comes from the views
|
|
14
|
-
# AssembliesTypePresenter.new(action_log, view_helpers).present
|
|
15
|
-
class AssembliesTypePresenter < Decidim::Log::BasePresenter
|
|
16
|
-
private
|
|
17
|
-
|
|
18
|
-
def diff_fields_mapping
|
|
19
|
-
{
|
|
20
|
-
title: :i18n
|
|
21
|
-
}
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
def i18n_labels_scope
|
|
25
|
-
"activemodel.attributes.assemblies_type"
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def action_string
|
|
29
|
-
case action
|
|
30
|
-
when "create", "delete", "update"
|
|
31
|
-
"decidim.admin_log.assembly_type.#{action}"
|
|
32
|
-
else
|
|
33
|
-
super
|
|
34
|
-
end
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
def diff_actions
|
|
38
|
-
super + %w(delete)
|
|
39
|
-
end
|
|
40
|
-
end
|
|
41
|
-
end
|
|
42
|
-
end
|
|
43
|
-
end
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Log
|
|
5
|
-
module ValueTypes
|
|
6
|
-
# This class presents the given value as a Decidim::AssembliesType. Check
|
|
7
|
-
# the `DefaultPresenter` for more info on how value
|
|
8
|
-
# presenters work.
|
|
9
|
-
class AssemblyTypePresenter < DefaultPresenter
|
|
10
|
-
# Public: Presents the value as a Decidim::AssembliesType. If the type can
|
|
11
|
-
# be found, it shows its title. Otherwise it shows its ID.
|
|
12
|
-
#
|
|
13
|
-
# Returns an HTML-safe String.
|
|
14
|
-
def present
|
|
15
|
-
return unless value
|
|
16
|
-
return h.translated_attribute(type.title) if type
|
|
17
|
-
|
|
18
|
-
I18n.t("not_found", id: value, scope: "decidim.log.value_types.assembly_type_presenter")
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
private
|
|
22
|
-
|
|
23
|
-
def type
|
|
24
|
-
@type ||= Decidim::AssembliesType.find_by(id: value)
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
end
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
module Decidim
|
|
4
|
-
module Assemblies
|
|
5
|
-
# This query filters assemblies by type.
|
|
6
|
-
class FilteredAssemblies < Decidim::Query
|
|
7
|
-
def initialize(filter)
|
|
8
|
-
@filter = filter
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
def assemblies
|
|
12
|
-
Decidim::Assembly
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
def query
|
|
16
|
-
return assemblies.all if @filter.blank?
|
|
17
|
-
|
|
18
|
-
assemblies.where(decidim_assemblies_type_id: @filter)
|
|
19
|
-
end
|
|
20
|
-
end
|
|
21
|
-
end
|
|
22
|
-
end
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
<% if assemblies.any? %>
|
|
2
|
-
<div class="profile__description">
|
|
3
|
-
<div class="font-semibold"><%= t(".member_of") %></div>
|
|
4
|
-
<% assemblies.each_with_index do |assembly, i| %>
|
|
5
|
-
<%= " · ".html_safe if i.positive? %>
|
|
6
|
-
<%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly, locale: I18n.locale), class: "hover:underline" %>
|
|
7
|
-
<% end %>
|
|
8
|
-
</div>
|
|
9
|
-
<% end %>
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
|
|
2
|
-
<% add_decidim_meta_tags(
|
|
3
|
-
title: translated_attribute(current_participatory_space.title),
|
|
4
|
-
resource: current_participatory_space) %>
|
|
5
|
-
<%
|
|
6
|
-
edit_link(
|
|
7
|
-
decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space.slug),
|
|
8
|
-
:update,
|
|
9
|
-
:assembly,
|
|
10
|
-
assembly: current_participatory_space
|
|
11
|
-
)
|
|
12
|
-
%>
|
|
13
|
-
|
|
14
|
-
<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
|
|
15
|
-
<div class="container py-8">
|
|
16
|
-
<h3 class="h3 decorator mb-10">
|
|
17
|
-
<%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
|
|
18
|
-
<span class="label text-md ml-2"><%= collection.size %></span>
|
|
19
|
-
</h3>
|
|
20
|
-
<div id="assembly_members-grid" class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
|
|
21
|
-
<%= render(collection) %>
|
|
22
|
-
</div>
|
|
23
|
-
</div>
|