decidim-assemblies 0.21.0 → 0.22.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/decidim/assemblies/assembly.svg +1 -3
- data/app/assets/javascripts/decidim/assemblies/orgchart.js.es6 +698 -0
- data/app/cells/decidim/assemblies/assembly_m/footer.erb +2 -2
- data/app/cells/decidim/assemblies/assembly_m_cell.rb +4 -0
- data/app/cells/decidim/assemblies/assembly_member/show.erb +4 -4
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb +10 -11
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +1 -0
- data/app/commands/decidim/assemblies/admin/create_assembly_admin.rb +2 -1
- data/app/commands/decidim/assemblies/admin/create_assembly_member.rb +12 -3
- data/app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb +22 -0
- data/app/commands/decidim/assemblies/admin/update_assemblies_setting.rb +46 -0
- data/app/commands/decidim/assemblies/admin/update_assembly_admin.rb +2 -1
- data/app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb +49 -0
- data/app/controllers/decidim/assemblies/assemblies_controller.rb +5 -1
- data/app/events/decidim/assemblies/create_assembly_member_event.rb +17 -0
- data/app/events/decidim/role_assigned_to_assembly_event.rb +28 -0
- data/app/forms/decidim/assemblies/admin/assemblies_setting_form.rb +14 -0
- data/app/forms/decidim/assemblies/admin/assembly_form.rb +14 -4
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +6 -3
- data/app/models/decidim/assemblies_setting.rb +17 -0
- data/app/permissions/decidim/assemblies/permissions.rb +30 -1
- data/app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb +27 -0
- data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb +1 -1
- data/app/queries/decidim/assemblies/parent_assemblies_for_select.rb +20 -1
- data/app/views/decidim/assemblies/_filter_by_type.html.erb +11 -9
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +3 -2
- data/app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb +10 -0
- data/app/views/decidim/assemblies/admin/assemblies_settings/edit.html.erb +6 -0
- data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb +2 -2
- data/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb +2 -2
- data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb +3 -3
- data/app/views/decidim/assemblies/assemblies/index.html.erb +11 -8
- data/app/views/decidim/assemblies/assemblies/show.html.erb +9 -8
- data/app/views/decidim/assemblies/assembly_members/index.html.erb +1 -1
- data/app/views/layouts/decidim/admin/assemblies.html.erb +5 -0
- data/config/locales/bg-BG.yml +7 -0
- data/config/locales/ca.yml +46 -0
- data/config/locales/cs.yml +76 -30
- data/config/locales/da-DK.yml +1 -0
- data/config/locales/de.yml +69 -0
- data/config/locales/el.yml +455 -0
- data/config/locales/en.yml +46 -0
- data/config/locales/es-MX.yml +46 -0
- data/config/locales/es-PY.yml +46 -0
- data/config/locales/es.yml +46 -0
- data/config/locales/et-EE.yml +1 -0
- data/config/locales/fi-plain.yml +46 -0
- data/config/locales/fi.yml +47 -1
- data/config/locales/fr-CA.yml +456 -0
- data/config/locales/fr.yml +67 -0
- data/config/locales/ga-IE.yml +1 -0
- data/config/locales/hr-HR.yml +1 -0
- data/config/locales/hu.yml +35 -2
- data/config/locales/it.yml +134 -76
- data/config/locales/ja-JP.yml +452 -0
- data/config/locales/lt-LT.yml +1 -0
- data/config/locales/lv-LV.yml +454 -0
- data/config/locales/mt-MT.yml +1 -0
- data/config/locales/nl.yml +58 -0
- data/config/locales/no.yml +57 -10
- data/config/locales/pl.yml +212 -143
- data/config/locales/pt-BR.yml +1 -1
- data/config/locales/pt.yml +188 -119
- data/config/locales/ro-RO.yml +422 -0
- data/config/locales/sk-SK.yml +168 -0
- data/config/locales/sk.yml +172 -0
- data/config/locales/sl.yml +132 -0
- data/config/locales/sr-CS.yml +73 -0
- data/config/locales/sv.yml +156 -89
- data/db/migrate/20200320105906_index_foreign_keys_in_decidim_assemblies.rb +7 -0
- data/db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb +7 -0
- data/db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb +8 -0
- data/db/migrate/20200430202456_create_decidim_assemblies_settings.rb +10 -0
- data/db/seeds/city.jpeg +0 -0
- data/db/seeds/city2.jpeg +0 -0
- data/lib/decidim/assemblies/admin_engine.rb +1 -0
- data/lib/decidim/assemblies/participatory_space.rb +6 -1
- data/lib/decidim/assemblies/test/factories.rb +5 -0
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +38 -8
@@ -0,0 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimAssembliesSettings < ActiveRecord::Migration[5.2]
|
4
|
+
def change
|
5
|
+
create_table :decidim_assemblies_settings do |t|
|
6
|
+
t.boolean :enable_organization_chart, default: true
|
7
|
+
t.references :decidim_organization, foreign_key: true
|
8
|
+
end
|
9
|
+
end
|
10
|
+
end
|
data/db/seeds/city.jpeg
CHANGED
Binary file
|
data/db/seeds/city2.jpeg
CHANGED
Binary file
|
@@ -16,6 +16,7 @@ module Decidim
|
|
16
16
|
|
17
17
|
routes do
|
18
18
|
resources :assemblies_types
|
19
|
+
resource :assemblies_settings, only: [:edit, :update], controller: "assemblies_settings"
|
19
20
|
|
20
21
|
resources :assemblies, param: :slug, except: [:show, :destroy] do
|
21
22
|
resource :publish, controller: "assembly_publications", only: [:create, :destroy]
|
@@ -28,6 +28,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
28
28
|
context.layout = "layouts/decidim/admin/assembly"
|
29
29
|
end
|
30
30
|
|
31
|
+
participatory_space.register_on_destroy_account do |user|
|
32
|
+
Decidim::AssemblyUserRole.where(user: user).destroy_all
|
33
|
+
Decidim::AssemblyMember.where(user: user).destroy_all
|
34
|
+
end
|
35
|
+
|
31
36
|
participatory_space.seeds do
|
32
37
|
organization = Decidim::Organization.first
|
33
38
|
seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
|
@@ -35,7 +40,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
35
40
|
Decidim::ContentBlock.create(
|
36
41
|
organization: organization,
|
37
42
|
weight: 32,
|
38
|
-
|
43
|
+
scope_name: :homepage,
|
39
44
|
manifest_name: :highlighted_assemblies,
|
40
45
|
published_at: Time.current
|
41
46
|
)
|
@@ -8,6 +8,11 @@ FactoryBot.define do
|
|
8
8
|
"#{Faker::Internet.slug(nil, "-")}-#{n}"
|
9
9
|
end
|
10
10
|
|
11
|
+
factory :assemblies_setting, class: "Decidim::AssembliesSetting" do
|
12
|
+
enable_organization_chart { true }
|
13
|
+
organization
|
14
|
+
end
|
15
|
+
|
11
16
|
factory :assemblies_type, class: "Decidim::AssembliesType" do
|
12
17
|
title { generate_localized_title }
|
13
18
|
organization
|
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.
|
4
|
+
version: 0.22.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: 2020-
|
13
|
+
date: 2020-09-01 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.22.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.
|
28
|
+
version: 0.22.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.
|
35
|
+
version: 0.22.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.
|
42
|
+
version: 0.22.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.
|
49
|
+
version: 0.22.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.
|
56
|
+
version: 0.22.0
|
57
57
|
description: Assemblies component for decidim.
|
58
58
|
email:
|
59
59
|
- josepjaume@gmail.com
|
@@ -71,6 +71,7 @@ files:
|
|
71
71
|
- app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6
|
72
72
|
- app/assets/javascripts/decidim/assemblies/admin/assembly_members.js.es6
|
73
73
|
- app/assets/javascripts/decidim/assemblies/assemblies.js.es6
|
74
|
+
- app/assets/javascripts/decidim/assemblies/orgchart.js.es6
|
74
75
|
- app/cells/decidim/assemblies/assembly_cell.rb
|
75
76
|
- app/cells/decidim/assemblies/assembly_m/footer.erb
|
76
77
|
- app/cells/decidim/assemblies/assembly_m/tags.erb
|
@@ -90,8 +91,10 @@ files:
|
|
90
91
|
- app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
|
91
92
|
- app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
|
92
93
|
- app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
|
94
|
+
- app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
|
93
95
|
- app/commands/decidim/assemblies/admin/publish_assembly.rb
|
94
96
|
- app/commands/decidim/assemblies/admin/unpublish_assembly.rb
|
97
|
+
- app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
|
95
98
|
- app/commands/decidim/assemblies/admin/update_assemblies_type.rb
|
96
99
|
- app/commands/decidim/assemblies/admin/update_assembly.rb
|
97
100
|
- app/commands/decidim/assemblies/admin/update_assembly_admin.rb
|
@@ -102,6 +105,7 @@ files:
|
|
102
105
|
- app/controllers/concerns/decidim/assemblies/admin/filterable.rb
|
103
106
|
- app/controllers/decidim/assemblies/admin/application_controller.rb
|
104
107
|
- app/controllers/decidim/assemblies/admin/assemblies_controller.rb
|
108
|
+
- app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb
|
105
109
|
- app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb
|
106
110
|
- app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
|
107
111
|
- app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
|
@@ -121,6 +125,9 @@ files:
|
|
121
125
|
- app/controllers/decidim/assemblies/assemblies_controller.rb
|
122
126
|
- app/controllers/decidim/assemblies/assembly_members_controller.rb
|
123
127
|
- app/controllers/decidim/assemblies/assembly_widgets_controller.rb
|
128
|
+
- app/events/decidim/assemblies/create_assembly_member_event.rb
|
129
|
+
- app/events/decidim/role_assigned_to_assembly_event.rb
|
130
|
+
- app/forms/decidim/assemblies/admin/assemblies_setting_form.rb
|
124
131
|
- app/forms/decidim/assemblies/admin/assemblies_type_form.rb
|
125
132
|
- app/forms/decidim/assemblies/admin/assembly_copy_form.rb
|
126
133
|
- app/forms/decidim/assemblies/admin/assembly_form.rb
|
@@ -129,12 +136,14 @@ files:
|
|
129
136
|
- app/helpers/decidim/assemblies/admin/assemblies_helper.rb
|
130
137
|
- app/helpers/decidim/assemblies/assemblies_helper.rb
|
131
138
|
- app/helpers/decidim/assemblies/filter_assemblies_helper.rb
|
139
|
+
- app/models/decidim/assemblies_setting.rb
|
132
140
|
- app/models/decidim/assemblies_type.rb
|
133
141
|
- app/models/decidim/assembly.rb
|
134
142
|
- app/models/decidim/assembly_member.rb
|
135
143
|
- app/models/decidim/assembly_user_role.rb
|
136
144
|
- app/permissions/decidim/assemblies/permissions.rb
|
137
145
|
- app/presenters/decidim/admin/assembly_member_presenter.rb
|
146
|
+
- app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
|
138
147
|
- app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
|
139
148
|
- app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
|
140
149
|
- app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
|
@@ -170,6 +179,8 @@ files:
|
|
170
179
|
- app/views/decidim/assemblies/admin/assemblies/edit.html.erb
|
171
180
|
- app/views/decidim/assemblies/admin/assemblies/index.html.erb
|
172
181
|
- app/views/decidim/assemblies/admin/assemblies/new.html.erb
|
182
|
+
- app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb
|
183
|
+
- app/views/decidim/assemblies/admin/assemblies_settings/edit.html.erb
|
173
184
|
- app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
|
174
185
|
- app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb
|
175
186
|
- app/views/decidim/assemblies/admin/assemblies_types/index.html.erb
|
@@ -202,9 +213,11 @@ files:
|
|
202
213
|
- app/views/layouts/decidim/assembly.html.erb
|
203
214
|
- config/locales/ar-SA.yml
|
204
215
|
- config/locales/ar.yml
|
216
|
+
- config/locales/bg-BG.yml
|
205
217
|
- config/locales/ca.yml
|
206
218
|
- config/locales/cs-CZ.yml
|
207
219
|
- config/locales/cs.yml
|
220
|
+
- config/locales/da-DK.yml
|
208
221
|
- config/locales/de.yml
|
209
222
|
- config/locales/el-GR.yml
|
210
223
|
- config/locales/el.yml
|
@@ -213,22 +226,35 @@ files:
|
|
213
226
|
- config/locales/es-MX.yml
|
214
227
|
- config/locales/es-PY.yml
|
215
228
|
- config/locales/es.yml
|
229
|
+
- config/locales/et-EE.yml
|
216
230
|
- config/locales/eu.yml
|
217
231
|
- config/locales/fi-pl.yml
|
218
232
|
- config/locales/fi-plain.yml
|
219
233
|
- config/locales/fi.yml
|
234
|
+
- config/locales/fr-CA.yml
|
220
235
|
- config/locales/fr.yml
|
236
|
+
- config/locales/ga-IE.yml
|
221
237
|
- config/locales/gl.yml
|
238
|
+
- config/locales/hr-HR.yml
|
222
239
|
- config/locales/hu.yml
|
223
240
|
- config/locales/id-ID.yml
|
224
241
|
- config/locales/is-IS.yml
|
225
242
|
- config/locales/it.yml
|
243
|
+
- config/locales/ja-JP.yml
|
244
|
+
- config/locales/lt-LT.yml
|
245
|
+
- config/locales/lv-LV.yml
|
246
|
+
- config/locales/mt-MT.yml
|
226
247
|
- config/locales/nl.yml
|
227
248
|
- config/locales/no.yml
|
228
249
|
- config/locales/pl.yml
|
229
250
|
- config/locales/pt-BR.yml
|
230
251
|
- config/locales/pt.yml
|
252
|
+
- config/locales/ro-RO.yml
|
231
253
|
- config/locales/ru.yml
|
254
|
+
- config/locales/sk-SK.yml
|
255
|
+
- config/locales/sk.yml
|
256
|
+
- config/locales/sl.yml
|
257
|
+
- config/locales/sr-CS.yml
|
232
258
|
- config/locales/sv.yml
|
233
259
|
- config/locales/tr-TR.yml
|
234
260
|
- config/locales/uk.yml
|
@@ -246,6 +272,10 @@ files:
|
|
246
272
|
- db/migrate/20190215093700_reset_negative_children_count_counters.rb
|
247
273
|
- db/migrate/20200108113855_create_decidim_assembly_types.rb
|
248
274
|
- db/migrate/20200108123050_migrate_decidim_assembly_types.rb
|
275
|
+
- db/migrate/20200320105906_index_foreign_keys_in_decidim_assemblies.rb
|
276
|
+
- db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb
|
277
|
+
- db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb
|
278
|
+
- db/migrate/20200430202456_create_decidim_assemblies_settings.rb
|
249
279
|
- db/seeds/Exampledocument.pdf
|
250
280
|
- db/seeds/city.jpeg
|
251
281
|
- db/seeds/city2.jpeg
|