decidim-assemblies 0.19.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 +5 -5
- 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_assemblies_type.rb +45 -0
- data/app/commands/decidim/assemblies/admin/create_assembly.rb +1 -2
- 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/destroy_assemblies_type.rb +45 -0
- 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_assemblies_type.rb +46 -0
- data/app/commands/decidim/assemblies/admin/update_assembly.rb +1 -2
- data/app/commands/decidim/assemblies/admin/update_assembly_admin.rb +2 -1
- data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb +30 -0
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +8 -29
- data/app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb +49 -0
- data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb +107 -0
- data/app/controllers/decidim/assemblies/assemblies_controller.rb +6 -2
- 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/assemblies_type_form.rb +17 -0
- data/app/forms/decidim/assemblies/admin/assembly_form.rb +32 -13
- data/app/helpers/decidim/assemblies/admin/assemblies_helper.rb +6 -0
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +6 -3
- data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb +10 -7
- data/app/models/decidim/assemblies_setting.rb +17 -0
- data/app/models/decidim/assemblies_type.rb +24 -0
- data/app/models/decidim/assembly.rb +25 -2
- data/app/models/decidim/assembly_user_role.rb +1 -1
- data/app/permissions/decidim/assemblies/permissions.rb +55 -1
- data/app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb +27 -0
- data/app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb +43 -0
- data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +1 -2
- data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb +1 -1
- data/app/presenters/decidim/log/value_types/assembly_type_presenter.rb +29 -0
- data/app/queries/decidim/assemblies/filtered_assemblies.rb +2 -2
- data/app/queries/decidim/assemblies/parent_assemblies_for_select.rb +42 -0
- data/app/services/decidim/assemblies/assembly_search.rb +3 -3
- data/app/types/decidim/assemblies/assemblies_type_type.rb +17 -0
- data/app/types/decidim/assemblies/assembly_member_type.rb +29 -0
- data/app/types/decidim/assemblies/assembly_type.rb +67 -0
- data/app/views/decidim/assemblies/_filter_by_type.html.erb +11 -7
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +2 -6
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +8 -4
- 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/assemblies_types/_form.html.erb +11 -0
- data/app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb +6 -0
- data/app/views/decidim/assemblies/admin/assemblies_types/index.html.erb +43 -0
- data/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb +7 -0
- data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb +30 -30
- 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 +10 -13
- data/app/views/decidim/assemblies/assembly_members/index.html.erb +1 -1
- data/app/views/layouts/decidim/admin/assemblies.html.erb +22 -0
- data/app/views/layouts/decidim/admin/assembly.html.erb +2 -2
- data/config/locales/ar.yml +60 -27
- data/config/locales/bg-BG.yml +7 -0
- data/config/locales/ca.yml +79 -1
- data/config/locales/cs.yml +125 -47
- data/config/locales/da-DK.yml +1 -0
- data/config/locales/de.yml +80 -0
- data/config/locales/el-GR.yml +1 -0
- data/config/locales/el.yml +456 -0
- data/config/locales/en.yml +78 -0
- data/config/locales/es-MX.yml +79 -0
- data/config/locales/es-PY.yml +79 -0
- data/config/locales/es.yml +78 -0
- data/config/locales/et-EE.yml +1 -0
- data/config/locales/eu.yml +11 -0
- data/config/locales/fi-plain.yml +78 -0
- data/config/locales/fi.yml +81 -3
- data/config/locales/fr-CA.yml +456 -0
- data/config/locales/fr.yml +78 -0
- data/config/locales/ga-IE.yml +1 -0
- data/config/locales/gl.yml +11 -0
- data/config/locales/hr-HR.yml +1 -0
- data/config/locales/hu.yml +67 -2
- data/config/locales/id-ID.yml +11 -0
- data/config/locales/is-IS.yml +263 -0
- data/config/locales/it.yml +181 -102
- 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 +86 -8
- data/config/locales/no.yml +451 -0
- data/config/locales/pl.yml +222 -142
- data/config/locales/pt-BR.yml +12 -1
- data/config/locales/pt.yml +198 -118
- data/config/locales/ro-RO.yml +422 -0
- data/config/locales/ru.yml +11 -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 +167 -88
- data/config/locales/tr-TR.yml +11 -0
- data/config/locales/uk.yml +11 -0
- data/db/migrate/20200108113855_create_decidim_assembly_types.rb +19 -0
- data/db/migrate/20200108123050_migrate_decidim_assembly_types.rb +83 -0
- 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 +3 -0
- data/lib/decidim/assemblies/engine.rb +7 -0
- data/lib/decidim/assemblies/participatory_space.rb +11 -3
- data/lib/decidim/assemblies/query_extensions.rb +40 -0
- data/lib/decidim/assemblies/test/factories.rb +29 -2
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +62 -10
- data/app/views/decidim/assemblies/assembly_widgets/show.html.erb +0 -11
data/config/locales/tr-TR.yml
CHANGED
@@ -16,6 +16,7 @@ tr:
|
|
16
16
|
created_by_other: Diğer tarafından oluşturuldu
|
17
17
|
creation_date: Tarih oluşturuldu
|
18
18
|
decidim_area_id: alan
|
19
|
+
decidim_assemblies_type_id: Montaj tipi
|
19
20
|
decidim_scope_id: kapsam
|
20
21
|
description: Açıklama
|
21
22
|
developer_group: Tanıtım grubu
|
@@ -99,6 +100,9 @@ tr:
|
|
99
100
|
create:
|
100
101
|
error: Bu derlemeyi çoğaltırken bir hata oluştu.
|
101
102
|
success: Montaj başarıyla kopyalandı.
|
103
|
+
assemblies_types:
|
104
|
+
new:
|
105
|
+
create: yaratmak
|
102
106
|
assembly_copies:
|
103
107
|
new:
|
104
108
|
copy: kopya
|
@@ -159,6 +163,10 @@ tr:
|
|
159
163
|
moderations: Denetimler
|
160
164
|
private_users: Özel kullanıcılar
|
161
165
|
models:
|
166
|
+
assemblies_types:
|
167
|
+
fields:
|
168
|
+
created_at: Düzenlendi
|
169
|
+
title: Başlık
|
162
170
|
assembly:
|
163
171
|
fields:
|
164
172
|
created_at: Düzenlendi
|
@@ -224,6 +232,9 @@ tr:
|
|
224
232
|
social_handlers: Sosyal
|
225
233
|
title: Genel bilgi
|
226
234
|
visbility: görünürlük
|
235
|
+
assemblies_types:
|
236
|
+
form:
|
237
|
+
title: Başlık
|
227
238
|
assembly_copies:
|
228
239
|
form:
|
229
240
|
slug_help: 'URL sümükleri, bu derleme işaret eden URL''leri oluşturmak için kullanılır. Sadece harfleri, sayıları ve kısa çizgileri kabul eder ve bir harfle başlamalıdır. Örnek: %{url}'
|
data/config/locales/uk.yml
CHANGED
@@ -16,6 +16,7 @@ uk:
|
|
16
16
|
created_by_other: Створено кимось іншим
|
17
17
|
creation_date: Дата створення
|
18
18
|
decidim_area_id: Дільниця
|
19
|
+
decidim_assemblies_type_id: Різновид зборів
|
19
20
|
decidim_scope_id: Обсяг
|
20
21
|
description: Опис
|
21
22
|
developer_group: Робочий гурт з просування
|
@@ -104,6 +105,9 @@ uk:
|
|
104
105
|
create:
|
105
106
|
error: При спробі створити копію цих зборів сталася помилка.
|
106
107
|
success: Успішно створено копію зборів.
|
108
|
+
assemblies_types:
|
109
|
+
new:
|
110
|
+
create: Додати
|
107
111
|
assembly_copies:
|
108
112
|
new:
|
109
113
|
copy: Скопіювати
|
@@ -164,6 +168,10 @@ uk:
|
|
164
168
|
moderations: Дії з модерації
|
165
169
|
private_users: Приватні учасники
|
166
170
|
models:
|
171
|
+
assemblies_types:
|
172
|
+
fields:
|
173
|
+
created_at: 'Додано:'
|
174
|
+
title: Назва
|
167
175
|
assembly:
|
168
176
|
fields:
|
169
177
|
created_at: 'Додано:'
|
@@ -222,6 +230,9 @@ uk:
|
|
222
230
|
slug_help: 'Cкорочені веб-адреси використовуються для створення посилань на ці збори. В них припустимі лише букви, цифри та тире, і вони мають починатися з букви. Приклад: %{url}'
|
223
231
|
social_handlers: Соціальні мережі
|
224
232
|
title: Загальні відомості
|
233
|
+
assemblies_types:
|
234
|
+
form:
|
235
|
+
title: Назва
|
225
236
|
assembly_copies:
|
226
237
|
form:
|
227
238
|
slug_help: 'Cкорочені веб-адреси використовуються для створення посилань на ці збори. В них припустимі лише букви, цифри та тире, і вони мають починатися з букви. Приклад: %{url}'
|
@@ -0,0 +1,19 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimAssemblyTypes < ActiveRecord::Migration[5.2]
|
4
|
+
def change
|
5
|
+
create_table :decidim_assemblies_types do |t|
|
6
|
+
t.jsonb :title, null: false
|
7
|
+
|
8
|
+
t.integer :decidim_organization_id,
|
9
|
+
foreign_key: true,
|
10
|
+
index: {
|
11
|
+
name: "index_decidim_assemblies_types_on_decidim_organization_id"
|
12
|
+
}
|
13
|
+
|
14
|
+
t.timestamps
|
15
|
+
end
|
16
|
+
|
17
|
+
add_reference :decidim_assemblies, :decidim_assemblies_type, index: true, foreign_key: true
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,83 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Migrates freezed assembly types to a table where to configure them
|
4
|
+
class MigrateDecidimAssemblyTypes < ActiveRecord::Migration[5.2]
|
5
|
+
LEGACY_TYPES = {
|
6
|
+
"government" => "Government",
|
7
|
+
"executive" => "Executive",
|
8
|
+
"consultative_advisory" => "Consultative/Advisory",
|
9
|
+
"participatory" => "Participatory",
|
10
|
+
"working_group" => "Working group",
|
11
|
+
"commission" => "Comission",
|
12
|
+
"others" => "Others"
|
13
|
+
}.freeze
|
14
|
+
|
15
|
+
class Organization < ApplicationRecord
|
16
|
+
self.table_name = :decidim_organizations
|
17
|
+
end
|
18
|
+
|
19
|
+
class Assembly < ApplicationRecord
|
20
|
+
self.table_name = :decidim_assemblies
|
21
|
+
end
|
22
|
+
|
23
|
+
class AssemblyType < ApplicationRecord
|
24
|
+
self.table_name = :decidim_assemblies_types
|
25
|
+
end
|
26
|
+
|
27
|
+
def up
|
28
|
+
Organization.find_each do |organization|
|
29
|
+
LEGACY_TYPES.each do |type, _english|
|
30
|
+
title = {}
|
31
|
+
organization.available_locales.each do |lang|
|
32
|
+
t = type_localized(type, lang)
|
33
|
+
title[lang] = t if t
|
34
|
+
end
|
35
|
+
|
36
|
+
unless type == "others"
|
37
|
+
assembly_type = AssemblyType.find_or_create_by(
|
38
|
+
decidim_organization_id: organization.id,
|
39
|
+
title: title
|
40
|
+
)
|
41
|
+
end
|
42
|
+
Assembly.where(decidim_organization_id: organization.id, assembly_type: type).each do |assembly|
|
43
|
+
if type == "others"
|
44
|
+
assembly_type = AssemblyType.find_or_create_by(
|
45
|
+
decidim_organization_id: organization.id,
|
46
|
+
title: assembly.assembly_type_other
|
47
|
+
)
|
48
|
+
end
|
49
|
+
assembly.decidim_assemblies_type_id = assembly_type.id
|
50
|
+
assembly.save
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
def down
|
57
|
+
Assembly.find_each do |assembly|
|
58
|
+
next unless assembly.decidim_assemblies_type_id
|
59
|
+
|
60
|
+
assembly_type = AssemblyType.find(assembly.decidim_assemblies_type_id)
|
61
|
+
next unless assembly_type
|
62
|
+
|
63
|
+
key = LEGACY_TYPES.find { |type, _english| type_localized(type, "en") == assembly_type.title["en"] }
|
64
|
+
|
65
|
+
unless key
|
66
|
+
key = "others"
|
67
|
+
assembly.assembly_type_other = assembly_type.title
|
68
|
+
end
|
69
|
+
assembly.assembly_type = key
|
70
|
+
assembly.save
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
private
|
75
|
+
|
76
|
+
def type_localized(type, lang)
|
77
|
+
I18n.with_locale(lang) do
|
78
|
+
t = I18n.t("assembly_types.#{type}", scope: "decidim.assemblies", default: false)
|
79
|
+
t ||= LEGACY_TYPES[type] if lang == "en"
|
80
|
+
t
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
@@ -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
|
@@ -15,6 +15,9 @@ module Decidim
|
|
15
15
|
paths["lib/tasks"] = nil
|
16
16
|
|
17
17
|
routes do
|
18
|
+
resources :assemblies_types
|
19
|
+
resource :assemblies_settings, only: [:edit, :update], controller: "assemblies_settings"
|
20
|
+
|
18
21
|
resources :assemblies, param: :slug, except: [:show, :destroy] do
|
19
22
|
resource :publish, controller: "assembly_publications", only: [:create, :destroy]
|
20
23
|
resources :copies, controller: "assembly_copies", only: [:new, :create]
|
@@ -4,6 +4,7 @@ require "rails"
|
|
4
4
|
require "active_support/all"
|
5
5
|
|
6
6
|
require "decidim/core"
|
7
|
+
require "decidim/assemblies/query_extensions"
|
7
8
|
|
8
9
|
module Decidim
|
9
10
|
module Assemblies
|
@@ -108,6 +109,12 @@ module Decidim
|
|
108
109
|
end
|
109
110
|
end
|
110
111
|
end
|
112
|
+
|
113
|
+
initializer "decidim_assemblies.query_extensions" do
|
114
|
+
Decidim::Api::QueryType.define do
|
115
|
+
QueryExtensions.define(self)
|
116
|
+
end
|
117
|
+
end
|
111
118
|
end
|
112
119
|
end
|
113
120
|
end
|
@@ -10,9 +10,12 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
10
10
|
|
11
11
|
participatory_space.permissions_class_name = "Decidim::Assemblies::Permissions"
|
12
12
|
|
13
|
+
participatory_space.query_type = "Decidim::Assemblies::AssemblyType"
|
14
|
+
|
13
15
|
participatory_space.register_resource(:assembly) do |resource|
|
14
16
|
resource.model_class_name = "Decidim::Assembly"
|
15
17
|
resource.card = "decidim/assemblies/assembly"
|
18
|
+
resource.searchable = true
|
16
19
|
end
|
17
20
|
|
18
21
|
participatory_space.context(:public) do |context|
|
@@ -25,6 +28,11 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
25
28
|
context.layout = "layouts/decidim/admin/assembly"
|
26
29
|
end
|
27
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
|
+
|
28
36
|
participatory_space.seeds do
|
29
37
|
organization = Decidim::Organization.first
|
30
38
|
seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
|
@@ -32,7 +40,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
32
40
|
Decidim::ContentBlock.create(
|
33
41
|
organization: organization,
|
34
42
|
weight: 32,
|
35
|
-
|
43
|
+
scope_name: :homepage,
|
36
44
|
manifest_name: :highlighted_assemblies,
|
37
45
|
published_at: Time.current
|
38
46
|
)
|
@@ -67,8 +75,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
67
75
|
composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
|
68
76
|
Decidim::Faker::Localized.paragraph(3)
|
69
77
|
end,
|
70
|
-
assembly_type:
|
71
|
-
assembly_type_other: Decidim::Faker::Localized.word,
|
78
|
+
assembly_type: Decidim::AssembliesType.create!(organization: organization, title: Decidim::Faker::Localized.word),
|
72
79
|
creation_date: 1.day.from_now,
|
73
80
|
created_by: "others",
|
74
81
|
created_by_other: Decidim::Faker::Localized.word,
|
@@ -149,6 +156,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
149
156
|
)
|
150
157
|
|
151
158
|
[assembly, child].each do |current_assembly|
|
159
|
+
current_assembly.add_to_index_as_search_resource
|
152
160
|
attachment_collection = Decidim::AttachmentCollection.create!(
|
153
161
|
name: Decidim::Faker::Localized.word,
|
154
162
|
description: Decidim::Faker::Localized.sentence(5),
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Assemblies
|
5
|
+
# This module's job is to extend the API with custom fields related to
|
6
|
+
# decidim-assemblies.
|
7
|
+
module QueryExtensions
|
8
|
+
# Public: Extends a type with `decidim-assemblies`'s fields.
|
9
|
+
#
|
10
|
+
# type - A GraphQL::BaseType to extend.
|
11
|
+
#
|
12
|
+
# Returns nothing.
|
13
|
+
def self.define(type)
|
14
|
+
type.field :assembliesTypes do
|
15
|
+
type !types[AssembliesTypeType]
|
16
|
+
description "Lists all assemblies types"
|
17
|
+
|
18
|
+
resolve lambda { |_obj, _args, ctx|
|
19
|
+
Decidim::AssembliesType.where(
|
20
|
+
organization: ctx[:current_organization]
|
21
|
+
)
|
22
|
+
}
|
23
|
+
end
|
24
|
+
|
25
|
+
type.field :assembliesType do
|
26
|
+
type AssembliesTypeType
|
27
|
+
description "Finds an assemblies type group"
|
28
|
+
argument :id, !types.ID, "The ID of the Assemblies type"
|
29
|
+
|
30
|
+
resolve lambda { |_obj, args, ctx|
|
31
|
+
Decidim::AssembliesType.find_by(
|
32
|
+
organization: ctx[:current_organization],
|
33
|
+
id: args[:id]
|
34
|
+
)
|
35
|
+
}
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -8,6 +8,16 @@ 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
|
+
|
16
|
+
factory :assemblies_type, class: "Decidim::AssembliesType" do
|
17
|
+
title { generate_localized_title }
|
18
|
+
organization
|
19
|
+
end
|
20
|
+
|
11
21
|
factory :assembly, class: "Decidim::Assembly" do
|
12
22
|
title { generate_localized_title }
|
13
23
|
slug { generate(:assembly_slug) }
|
@@ -28,8 +38,6 @@ FactoryBot.define do
|
|
28
38
|
private_space { false }
|
29
39
|
purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
|
30
40
|
composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
|
31
|
-
assembly_type { "others" }
|
32
|
-
assembly_type_other { generate_localized_title }
|
33
41
|
creation_date { 1.month.ago }
|
34
42
|
created_by { "others" }
|
35
43
|
created_by_other { Decidim::Faker::Localized.word }
|
@@ -46,6 +54,10 @@ FactoryBot.define do
|
|
46
54
|
youtube_handler { "others" }
|
47
55
|
github_handler { "others" }
|
48
56
|
|
57
|
+
trait :with_type do
|
58
|
+
assembly_type { create :assemblies_type, organization: organization }
|
59
|
+
end
|
60
|
+
|
49
61
|
trait :promoted do
|
50
62
|
promoted { true }
|
51
63
|
end
|
@@ -130,6 +142,21 @@ FactoryBot.define do
|
|
130
142
|
end
|
131
143
|
end
|
132
144
|
|
145
|
+
factory :assembly_valuator, parent: :user, class: "Decidim::User" do
|
146
|
+
transient do
|
147
|
+
assembly { create(:assembly) }
|
148
|
+
end
|
149
|
+
|
150
|
+
organization { assembly.organization }
|
151
|
+
|
152
|
+
after(:create) do |user, evaluator|
|
153
|
+
create :assembly_user_role,
|
154
|
+
user: user,
|
155
|
+
assembly: evaluator.assembly,
|
156
|
+
role: :valuator
|
157
|
+
end
|
158
|
+
end
|
159
|
+
|
133
160
|
factory :assembly_member, class: "Decidim::AssemblyMember" do
|
134
161
|
assembly { create(:assembly) }
|
135
162
|
|
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:
|
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
|
@@ -83,21 +84,29 @@ files:
|
|
83
84
|
- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_cell.rb
|
84
85
|
- app/cells/decidim/assembly_activity_cell.rb
|
85
86
|
- app/commands/decidim/assemblies/admin/copy_assembly.rb
|
87
|
+
- app/commands/decidim/assemblies/admin/create_assemblies_type.rb
|
86
88
|
- app/commands/decidim/assemblies/admin/create_assembly.rb
|
87
89
|
- app/commands/decidim/assemblies/admin/create_assembly_admin.rb
|
88
90
|
- app/commands/decidim/assemblies/admin/create_assembly_member.rb
|
91
|
+
- app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
|
89
92
|
- app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
|
90
93
|
- app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
|
94
|
+
- app/commands/decidim/assemblies/admin/notify_role_assigned_to_assembly.rb
|
91
95
|
- app/commands/decidim/assemblies/admin/publish_assembly.rb
|
92
96
|
- app/commands/decidim/assemblies/admin/unpublish_assembly.rb
|
97
|
+
- app/commands/decidim/assemblies/admin/update_assemblies_setting.rb
|
98
|
+
- app/commands/decidim/assemblies/admin/update_assemblies_type.rb
|
93
99
|
- app/commands/decidim/assemblies/admin/update_assembly.rb
|
94
100
|
- app/commands/decidim/assemblies/admin/update_assembly_admin.rb
|
95
101
|
- app/commands/decidim/assemblies/admin/update_assembly_member.rb
|
96
102
|
- app/constraints/decidim/assemblies/current_assembly.rb
|
97
103
|
- app/constraints/decidim/assemblies/current_component.rb
|
98
104
|
- app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
|
105
|
+
- app/controllers/concerns/decidim/assemblies/admin/filterable.rb
|
99
106
|
- app/controllers/decidim/assemblies/admin/application_controller.rb
|
100
107
|
- app/controllers/decidim/assemblies/admin/assemblies_controller.rb
|
108
|
+
- app/controllers/decidim/assemblies/admin/assemblies_settings_controller.rb
|
109
|
+
- app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb
|
101
110
|
- app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
|
102
111
|
- app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
|
103
112
|
- app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
|
@@ -116,6 +125,10 @@ files:
|
|
116
125
|
- app/controllers/decidim/assemblies/assemblies_controller.rb
|
117
126
|
- app/controllers/decidim/assemblies/assembly_members_controller.rb
|
118
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
|
131
|
+
- app/forms/decidim/assemblies/admin/assemblies_type_form.rb
|
119
132
|
- app/forms/decidim/assemblies/admin/assembly_copy_form.rb
|
120
133
|
- app/forms/decidim/assemblies/admin/assembly_form.rb
|
121
134
|
- app/forms/decidim/assemblies/admin/assembly_member_form.rb
|
@@ -123,11 +136,15 @@ files:
|
|
123
136
|
- app/helpers/decidim/assemblies/admin/assemblies_helper.rb
|
124
137
|
- app/helpers/decidim/assemblies/assemblies_helper.rb
|
125
138
|
- app/helpers/decidim/assemblies/filter_assemblies_helper.rb
|
139
|
+
- app/models/decidim/assemblies_setting.rb
|
140
|
+
- app/models/decidim/assemblies_type.rb
|
126
141
|
- app/models/decidim/assembly.rb
|
127
142
|
- app/models/decidim/assembly_member.rb
|
128
143
|
- app/models/decidim/assembly_user_role.rb
|
129
144
|
- app/permissions/decidim/assemblies/permissions.rb
|
130
145
|
- app/presenters/decidim/admin/assembly_member_presenter.rb
|
146
|
+
- app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
|
147
|
+
- app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
|
131
148
|
- app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
|
132
149
|
- app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
|
133
150
|
- app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
|
@@ -137,6 +154,7 @@ files:
|
|
137
154
|
- app/presenters/decidim/assembly_member_presenter.rb
|
138
155
|
- app/presenters/decidim/assembly_presenter.rb
|
139
156
|
- app/presenters/decidim/log/value_types/assembly_presenter.rb
|
157
|
+
- app/presenters/decidim/log/value_types/assembly_type_presenter.rb
|
140
158
|
- app/queries/decidim/assemblies/admin/admin_users.rb
|
141
159
|
- app/queries/decidim/assemblies/admin/assembly_members.rb
|
142
160
|
- app/queries/decidim/assemblies/assemblies_with_user_role.rb
|
@@ -146,17 +164,27 @@ files:
|
|
146
164
|
- app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
|
147
165
|
- app/queries/decidim/assemblies/organization_published_assemblies.rb
|
148
166
|
- app/queries/decidim/assemblies/parent_assemblies.rb
|
167
|
+
- app/queries/decidim/assemblies/parent_assemblies_for_select.rb
|
149
168
|
- app/queries/decidim/assemblies/prioritized_assemblies.rb
|
150
169
|
- app/queries/decidim/assemblies/promoted_assemblies.rb
|
151
170
|
- app/queries/decidim/assemblies/published_assemblies.rb
|
152
171
|
- app/queries/decidim/assemblies/visible_assemblies.rb
|
153
172
|
- app/services/decidim/assemblies/assembly_search.rb
|
173
|
+
- app/types/decidim/assemblies/assemblies_type_type.rb
|
174
|
+
- app/types/decidim/assemblies/assembly_member_type.rb
|
175
|
+
- app/types/decidim/assemblies/assembly_type.rb
|
154
176
|
- app/views/decidim/assemblies/_assembly.html.erb
|
155
177
|
- app/views/decidim/assemblies/_filter_by_type.html.erb
|
156
178
|
- app/views/decidim/assemblies/admin/assemblies/_form.html.erb
|
157
179
|
- app/views/decidim/assemblies/admin/assemblies/edit.html.erb
|
158
180
|
- app/views/decidim/assemblies/admin/assemblies/index.html.erb
|
159
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
|
184
|
+
- app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
|
185
|
+
- app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb
|
186
|
+
- app/views/decidim/assemblies/admin/assemblies_types/index.html.erb
|
187
|
+
- app/views/decidim/assemblies/admin/assemblies_types/new.html.erb
|
160
188
|
- app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
|
161
189
|
- app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
|
162
190
|
- app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
|
@@ -176,7 +204,6 @@ files:
|
|
176
204
|
- app/views/decidim/assemblies/assemblies/index.js.erb
|
177
205
|
- app/views/decidim/assemblies/assemblies/show.html.erb
|
178
206
|
- app/views/decidim/assemblies/assembly_members/index.html.erb
|
179
|
-
- app/views/decidim/assemblies/assembly_widgets/show.html.erb
|
180
207
|
- app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
|
181
208
|
- app/views/decidim/assembly_members/_assembly_member.html.erb
|
182
209
|
- app/views/layouts/decidim/_assembly_header.html.erb
|
@@ -186,30 +213,48 @@ files:
|
|
186
213
|
- app/views/layouts/decidim/assembly.html.erb
|
187
214
|
- config/locales/ar-SA.yml
|
188
215
|
- config/locales/ar.yml
|
216
|
+
- config/locales/bg-BG.yml
|
189
217
|
- config/locales/ca.yml
|
190
218
|
- config/locales/cs-CZ.yml
|
191
219
|
- config/locales/cs.yml
|
220
|
+
- config/locales/da-DK.yml
|
192
221
|
- config/locales/de.yml
|
222
|
+
- config/locales/el-GR.yml
|
223
|
+
- config/locales/el.yml
|
193
224
|
- config/locales/en.yml
|
194
225
|
- config/locales/eo-UY.yml
|
195
226
|
- config/locales/es-MX.yml
|
196
227
|
- config/locales/es-PY.yml
|
197
228
|
- config/locales/es.yml
|
229
|
+
- config/locales/et-EE.yml
|
198
230
|
- config/locales/eu.yml
|
199
231
|
- config/locales/fi-pl.yml
|
200
232
|
- config/locales/fi-plain.yml
|
201
233
|
- config/locales/fi.yml
|
234
|
+
- config/locales/fr-CA.yml
|
202
235
|
- config/locales/fr.yml
|
236
|
+
- config/locales/ga-IE.yml
|
203
237
|
- config/locales/gl.yml
|
238
|
+
- config/locales/hr-HR.yml
|
204
239
|
- config/locales/hu.yml
|
205
240
|
- config/locales/id-ID.yml
|
241
|
+
- config/locales/is-IS.yml
|
206
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
|
207
247
|
- config/locales/nl.yml
|
208
248
|
- config/locales/no.yml
|
209
249
|
- config/locales/pl.yml
|
210
250
|
- config/locales/pt-BR.yml
|
211
251
|
- config/locales/pt.yml
|
252
|
+
- config/locales/ro-RO.yml
|
212
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
|
213
258
|
- config/locales/sv.yml
|
214
259
|
- config/locales/tr-TR.yml
|
215
260
|
- config/locales/uk.yml
|
@@ -225,6 +270,12 @@ files:
|
|
225
270
|
- db/migrate/20180426162405_assembly_member_belongs_to_user.rb
|
226
271
|
- db/migrate/20180515073049_update_assembly_members_index.rb
|
227
272
|
- db/migrate/20190215093700_reset_negative_children_count_counters.rb
|
273
|
+
- db/migrate/20200108113855_create_decidim_assembly_types.rb
|
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
|
228
279
|
- db/seeds/Exampledocument.pdf
|
229
280
|
- db/seeds/city.jpeg
|
230
281
|
- db/seeds/city2.jpeg
|
@@ -234,6 +285,7 @@ files:
|
|
234
285
|
- lib/decidim/assemblies/admin_engine.rb
|
235
286
|
- lib/decidim/assemblies/engine.rb
|
236
287
|
- lib/decidim/assemblies/participatory_space.rb
|
288
|
+
- lib/decidim/assemblies/query_extensions.rb
|
237
289
|
- lib/decidim/assemblies/test/factories.rb
|
238
290
|
- lib/decidim/assemblies/version.rb
|
239
291
|
homepage: https://github.com/decidim/decidim
|
@@ -255,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
255
307
|
- !ruby/object:Gem::Version
|
256
308
|
version: '0'
|
257
309
|
requirements: []
|
258
|
-
rubygems_version: 3.
|
310
|
+
rubygems_version: 3.1.2
|
259
311
|
signing_key:
|
260
312
|
specification_version: 4
|
261
313
|
summary: Decidim assemblies module
|