decidim-assemblies 0.13.1 → 0.14.1
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/app/cells/decidim/assemblies/assembly_cell.rb +1 -1
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb +31 -0
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +28 -0
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +6 -0
- data/app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb +0 -4
- data/app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb +0 -4
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb +0 -4
- data/app/models/decidim/assembly.rb +4 -0
- data/app/presenters/decidim/assembly_presenter.rb +14 -0
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +8 -2
- data/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/index.html.erb +8 -0
- data/app/views/decidim/assemblies/assemblies/show.html.erb +9 -0
- data/app/views/layouts/decidim/assembly.html.erb +0 -2
- data/config/locales/ca.yml +13 -8
- data/config/locales/en.yml +13 -8
- data/config/locales/es-PY.yml +13 -8
- data/config/locales/es.yml +13 -8
- data/config/locales/eu.yml +13 -8
- data/config/locales/fi.yml +96 -91
- data/config/locales/fr.yml +13 -8
- data/config/locales/gl.yml +13 -8
- data/config/locales/hu.yml +346 -0
- data/config/locales/it.yml +13 -8
- data/config/locales/nl.yml +13 -8
- data/config/locales/pl.yml +13 -8
- data/config/locales/pt-BR.yml +39 -34
- data/config/locales/pt.yml +13 -8
- data/config/locales/ru.yml +14 -11
- data/config/locales/sv.yml +122 -117
- data/config/locales/uk.yml +15 -12
- data/lib/decidim/assemblies/admin_engine.rb +1 -0
- data/lib/decidim/assemblies/engine.rb +10 -13
- data/lib/decidim/assemblies/participatory_space.rb +8 -0
- data/lib/decidim/assemblies/test/factories.rb +6 -6
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +13 -10
- data/app/views/decidim/assemblies/pages/home/_highlighted_assemblies.html.erb +0 -29
@@ -64,19 +64,6 @@ module Decidim
|
|
64
64
|
end
|
65
65
|
|
66
66
|
initializer "decidim_assemblies.view_hooks" do
|
67
|
-
Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
|
68
|
-
highlighted_assemblies = OrganizationPrioritizedAssemblies.new(view_context.current_organization, view_context.current_user)
|
69
|
-
|
70
|
-
next unless highlighted_assemblies.any?
|
71
|
-
|
72
|
-
view_context.render(
|
73
|
-
partial: "decidim/assemblies/pages/home/highlighted_assemblies",
|
74
|
-
locals: {
|
75
|
-
highlighted_assemblies: highlighted_assemblies
|
76
|
-
}
|
77
|
-
)
|
78
|
-
end
|
79
|
-
|
80
67
|
Decidim.view_hooks.register(:user_profile_bottom, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
|
81
68
|
assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
|
82
69
|
.query.distinct
|
@@ -86,6 +73,9 @@ module Decidim
|
|
86
73
|
|
87
74
|
next unless assemblies.any?
|
88
75
|
|
76
|
+
# Since this is rendered inside a cell we need to access the parent context in order to render it.
|
77
|
+
view_context = view_context.controller.view_context
|
78
|
+
|
89
79
|
view_context.render(
|
90
80
|
partial: "decidim/assemblies/pages/user_profile/member_of",
|
91
81
|
locals: {
|
@@ -94,6 +84,13 @@ module Decidim
|
|
94
84
|
)
|
95
85
|
end
|
96
86
|
end
|
87
|
+
|
88
|
+
initializer "decidim_assemblies.content_blocks" do
|
89
|
+
Decidim.content_blocks.register(:homepage, :highlighted_assemblies) do |content_block|
|
90
|
+
content_block.cell = "decidim/assemblies/content_blocks/highlighted_assemblies"
|
91
|
+
content_block.public_name_key = "decidim.assemblies.content_blocks.highlighted_assemblies.name"
|
92
|
+
end
|
93
|
+
end
|
97
94
|
end
|
98
95
|
end
|
99
96
|
end
|
@@ -29,6 +29,14 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
29
29
|
organization = Decidim::Organization.first
|
30
30
|
seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
|
31
31
|
|
32
|
+
Decidim::ContentBlock.create(
|
33
|
+
organization: organization,
|
34
|
+
weight: 32,
|
35
|
+
scope: :homepage,
|
36
|
+
manifest_name: :highlighted_assemblies,
|
37
|
+
published_at: Time.current
|
38
|
+
)
|
39
|
+
|
32
40
|
2.times do |n|
|
33
41
|
assembly = Decidim::Assembly.create!(
|
34
42
|
title: Decidim::Faker::Localized.sentence(5),
|
@@ -24,8 +24,8 @@ FactoryBot.define do
|
|
24
24
|
target { Decidim::Faker::Localized.sentence(3) }
|
25
25
|
participatory_scope { Decidim::Faker::Localized.sentence(1) }
|
26
26
|
participatory_structure { Decidim::Faker::Localized.sentence(2) }
|
27
|
-
show_statistics true
|
28
|
-
private_space false
|
27
|
+
show_statistics { true }
|
28
|
+
private_space { false }
|
29
29
|
purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
|
30
30
|
composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
|
31
31
|
assembly_type { "others" }
|
@@ -38,7 +38,7 @@ FactoryBot.define do
|
|
38
38
|
closing_date { 2.months.from_now.at_midnight }
|
39
39
|
closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
|
40
40
|
internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
|
41
|
-
is_transparent true
|
41
|
+
is_transparent { true }
|
42
42
|
special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
|
43
43
|
twitter_handler { "others" }
|
44
44
|
facebook_handler { "others" }
|
@@ -47,11 +47,11 @@ FactoryBot.define do
|
|
47
47
|
github_handler { "others" }
|
48
48
|
|
49
49
|
trait :promoted do
|
50
|
-
promoted true
|
50
|
+
promoted { true }
|
51
51
|
end
|
52
52
|
|
53
53
|
trait :unpublished do
|
54
|
-
published_at nil
|
54
|
+
published_at { nil }
|
55
55
|
end
|
56
56
|
|
57
57
|
trait :published do
|
@@ -66,7 +66,7 @@ FactoryBot.define do
|
|
66
66
|
factory :assembly_user_role, class: "Decidim::AssemblyUserRole" do
|
67
67
|
user
|
68
68
|
assembly { create :assembly, organization: user.organization }
|
69
|
-
role "admin"
|
69
|
+
role { "admin" }
|
70
70
|
end
|
71
71
|
|
72
72
|
factory :assembly_admin, parent: :user, class: "Decidim::User" do
|
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.14.1
|
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: 2018-
|
13
|
+
date: 2018-09-17 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.14.1
|
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.14.1
|
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.14.1
|
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.14.1
|
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.14.1
|
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.14.1
|
57
57
|
description: Assemblies component for decidim.
|
58
58
|
email:
|
59
59
|
- josepjaume@gmail.com
|
@@ -77,6 +77,8 @@ files:
|
|
77
77
|
- app/cells/decidim/assemblies/assembly_m_cell.rb
|
78
78
|
- app/cells/decidim/assemblies/assembly_member/show.erb
|
79
79
|
- app/cells/decidim/assemblies/assembly_member_cell.rb
|
80
|
+
- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
|
81
|
+
- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
|
80
82
|
- app/commands/decidim/assemblies/admin/copy_assembly.rb
|
81
83
|
- app/commands/decidim/assemblies/admin/create_assembly.rb
|
82
84
|
- app/commands/decidim/assemblies/admin/create_assembly_admin.rb
|
@@ -128,6 +130,7 @@ files:
|
|
128
130
|
- app/presenters/decidim/assemblies/admin_log/value_types/role_presenter.rb
|
129
131
|
- app/presenters/decidim/assemblies/assembly_stats_presenter.rb
|
130
132
|
- app/presenters/decidim/assembly_member_presenter.rb
|
133
|
+
- app/presenters/decidim/assembly_presenter.rb
|
131
134
|
- app/presenters/decidim/log/value_types/assembly_presenter.rb
|
132
135
|
- app/queries/decidim/assemblies/admin/admin_users.rb
|
133
136
|
- app/queries/decidim/assemblies/admin/assembly_members.rb
|
@@ -162,7 +165,6 @@ files:
|
|
162
165
|
- app/views/decidim/assemblies/assemblies/show.html.erb
|
163
166
|
- app/views/decidim/assemblies/assembly_members/index.html.erb
|
164
167
|
- app/views/decidim/assemblies/assembly_widgets/show.html.erb
|
165
|
-
- app/views/decidim/assemblies/pages/home/_highlighted_assemblies.html.erb
|
166
168
|
- app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
|
167
169
|
- app/views/decidim/assembly_members/_assembly_member.html.erb
|
168
170
|
- app/views/layouts/decidim/_assembly_header.html.erb
|
@@ -177,6 +179,7 @@ files:
|
|
177
179
|
- config/locales/fi.yml
|
178
180
|
- config/locales/fr.yml
|
179
181
|
- config/locales/gl.yml
|
182
|
+
- config/locales/hu.yml
|
180
183
|
- config/locales/it.yml
|
181
184
|
- config/locales/nl.yml
|
182
185
|
- config/locales/pl.yml
|
@@ -227,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
227
230
|
version: '0'
|
228
231
|
requirements: []
|
229
232
|
rubyforge_project:
|
230
|
-
rubygems_version: 2.7.
|
233
|
+
rubygems_version: 2.7.7
|
231
234
|
signing_key:
|
232
235
|
specification_version: 4
|
233
236
|
summary: Decidim assemblies module
|
@@ -1,29 +0,0 @@
|
|
1
|
-
<div class="row" id="highlighted-assemblies">
|
2
|
-
<h3 class="section-heading"><%= t(".active_assemblies") %></h3>
|
3
|
-
<div class="row collapse">
|
4
|
-
<div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
|
5
|
-
large-up-4 card-grid">
|
6
|
-
<% highlighted_assemblies.each do |assembly| %>
|
7
|
-
<div class="column">
|
8
|
-
<article class="card card--assembly card--mini">
|
9
|
-
<%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
|
10
|
-
<div class="card__image-top"
|
11
|
-
style="background-image:url(<%= assembly.hero_image.url %>)"></div>
|
12
|
-
<% end %>
|
13
|
-
<div class="card__content">
|
14
|
-
<%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
|
15
|
-
<h4 class="card__title"><%= translated_attribute assembly.title %></h4>
|
16
|
-
<% end %>
|
17
|
-
</div>
|
18
|
-
</article>
|
19
|
-
</div>
|
20
|
-
<% end %>
|
21
|
-
</div>
|
22
|
-
</div>
|
23
|
-
</div>
|
24
|
-
<div class="row" id="see-all-assemblies">
|
25
|
-
<div class="columns small-centered small-12
|
26
|
-
smallmedium-8 medium-6 large-4">
|
27
|
-
<%= link_to t(".see_all_assemblies"), decidim_assemblies.assemblies_path, class: "button expanded hollow button--sc home-section__cta" %>
|
28
|
-
</div>
|
29
|
-
</div>
|