decidim-assemblies 0.28.4 → 0.29.0.rc1
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_g_cell.rb +2 -2
- data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +0 -4
- data/app/cells/decidim/assemblies/content_blocks/stats_cell.rb +1 -1
- data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb +3 -31
- data/app/commands/decidim/assemblies/admin/create_assembly.rb +30 -89
- data/app/commands/decidim/assemblies/admin/create_assembly_member.rb +14 -66
- data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb +5 -37
- data/app/commands/decidim/assemblies/admin/import_assembly.rb +1 -1
- data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb +2 -35
- data/app/commands/decidim/assemblies/admin/update_assembly.rb +22 -99
- data/app/commands/decidim/assemblies/admin/update_assembly_member.rb +8 -69
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +5 -20
- data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb +4 -4
- data/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb +1 -1
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb +1 -1
- data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb +1 -1
- data/app/controllers/decidim/assemblies/application_controller.rb +4 -1
- data/app/controllers/decidim/assemblies/assemblies_controller.rb +0 -3
- data/app/controllers/decidim/assemblies/assembly_members_controller.rb +0 -2
- data/app/forms/decidim/assemblies/admin/assembly_form.rb +0 -1
- data/app/helpers/decidim/assemblies/assemblies_helper.rb +0 -26
- data/app/permissions/decidim/assemblies/permissions.rb +2 -2
- data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +0 -1
- data/app/serializers/decidim/assemblies/assembly_importer.rb +0 -1
- data/app/serializers/decidim/assemblies/assembly_serializer.rb +1 -2
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +5 -9
- data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +2 -2
- data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb +1 -1
- data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +1 -1
- data/app/views/decidim/assemblies/assemblies/show.html.erb +22 -18
- data/app/views/decidim/assemblies/assembly_members/index.html.erb +2 -1
- data/app/views/layouts/decidim/admin/assemblies.html.erb +1 -1
- data/config/locales/ar.yml +0 -6
- data/config/locales/bg.yml +2 -7
- data/config/locales/ca.yml +6 -11
- data/config/locales/cs.yml +1 -6
- data/config/locales/de.yml +15 -20
- data/config/locales/el.yml +0 -6
- data/config/locales/en.yml +2 -7
- data/config/locales/es-MX.yml +2 -7
- data/config/locales/es-PY.yml +1 -6
- data/config/locales/es.yml +4 -9
- data/config/locales/eu.yml +2 -7
- data/config/locales/fi-plain.yml +1 -6
- data/config/locales/fi.yml +1 -6
- data/config/locales/fr-CA.yml +2 -7
- data/config/locales/fr.yml +2 -7
- data/config/locales/ga-IE.yml +0 -3
- data/config/locales/gl.yml +0 -6
- data/config/locales/he-IL.yml +0 -4
- data/config/locales/hu.yml +1 -7
- data/config/locales/id-ID.yml +0 -5
- data/config/locales/is-IS.yml +0 -4
- data/config/locales/it.yml +0 -6
- data/config/locales/ja.yml +2 -7
- data/config/locales/lb.yml +0 -5
- data/config/locales/lt.yml +0 -6
- data/config/locales/lv.yml +0 -5
- data/config/locales/nl.yml +0 -6
- data/config/locales/no.yml +0 -6
- data/config/locales/pl.yml +1 -12
- data/config/locales/pt-BR.yml +0 -6
- data/config/locales/pt.yml +0 -6
- data/config/locales/ro-RO.yml +0 -6
- data/config/locales/ru.yml +0 -5
- data/config/locales/sk.yml +0 -3
- data/config/locales/sl.yml +0 -2
- data/config/locales/sq-AL.yml +2 -3
- data/config/locales/sv.yml +131 -197
- data/config/locales/tr-TR.yml +0 -5
- data/config/locales/uk.yml +0 -5
- data/config/locales/zh-CN.yml +0 -5
- data/config/locales/zh-TW.yml +0 -6
- data/db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb +11 -0
- data/decidim-assemblies.gemspec +1 -1
- data/lib/decidim/api/assembly_type.rb +5 -6
- data/lib/decidim/assemblies/content_blocks/registry_manager.rb +1 -1
- data/lib/decidim/assemblies/engine.rb +1 -0
- data/lib/decidim/assemblies/menu.rb +11 -0
- data/lib/decidim/assemblies/seeds.rb +1 -11
- data/lib/decidim/assemblies/test/factories.rb +0 -1
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +17 -18
- data/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb +0 -45
- data/app/views/layouts/decidim/assembly.html.erb +0 -18
|
@@ -5,84 +5,23 @@ module Decidim
|
|
|
5
5
|
module Admin
|
|
6
6
|
# A command with all the business logic when updating an assembly
|
|
7
7
|
# member in the system.
|
|
8
|
-
class UpdateAssemblyMember < Decidim::
|
|
9
|
-
|
|
8
|
+
class UpdateAssemblyMember < Decidim::Commands::UpdateResource
|
|
9
|
+
fetch_file_attributes :non_user_avatar
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
# form - A form object with the params.
|
|
14
|
-
# assembly_member - The AssemblyMember to update
|
|
15
|
-
def initialize(form, assembly_member)
|
|
16
|
-
@form = form
|
|
17
|
-
@assembly_member = assembly_member
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
# Executes the command. Broadcasts these events:
|
|
21
|
-
#
|
|
22
|
-
# - :ok when everything is valid.
|
|
23
|
-
# - :invalid if the form was not valid and we could not proceed.
|
|
24
|
-
#
|
|
25
|
-
# Returns nothing.
|
|
26
|
-
def call
|
|
27
|
-
return broadcast(:invalid) if form.invalid?
|
|
28
|
-
return broadcast(:invalid) unless assembly_member
|
|
29
|
-
|
|
30
|
-
assembly_member.assign_attributes(attributes)
|
|
31
|
-
|
|
32
|
-
if assembly_member.valid?
|
|
33
|
-
assembly_member.reload
|
|
34
|
-
update_assembly_member!
|
|
35
|
-
broadcast(:ok)
|
|
36
|
-
else
|
|
37
|
-
if assembly_member.errors.include? :non_user_avatar
|
|
38
|
-
form.errors.add(
|
|
39
|
-
:non_user_avatar,
|
|
40
|
-
assembly_member.errors[:non_user_avatar]
|
|
41
|
-
)
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
broadcast(:invalid)
|
|
45
|
-
end
|
|
46
|
-
end
|
|
11
|
+
fetch_form_attributes :full_name, :gender, :birthday, :birthplace, :ceased_date, :designation_date,
|
|
12
|
+
:position, :position_other, :weight, :user
|
|
47
13
|
|
|
48
14
|
private
|
|
49
15
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
def attributes
|
|
53
|
-
form.attributes.slice(
|
|
54
|
-
"full_name",
|
|
55
|
-
"gender",
|
|
56
|
-
"birthday",
|
|
57
|
-
"birthplace",
|
|
58
|
-
"ceased_date",
|
|
59
|
-
"designation_date",
|
|
60
|
-
"position",
|
|
61
|
-
"position_other",
|
|
62
|
-
"weight"
|
|
63
|
-
).symbolize_keys.merge(
|
|
64
|
-
user: form.user
|
|
65
|
-
).merge(
|
|
66
|
-
attachment_attributes(:non_user_avatar)
|
|
67
|
-
)
|
|
68
|
-
end
|
|
69
|
-
|
|
70
|
-
def update_assembly_member!
|
|
71
|
-
log_info = {
|
|
16
|
+
def extra_params
|
|
17
|
+
{
|
|
72
18
|
resource: {
|
|
73
|
-
title:
|
|
19
|
+
title: resource.full_name
|
|
74
20
|
},
|
|
75
21
|
participatory_space: {
|
|
76
|
-
title:
|
|
22
|
+
title: resource.assembly.title
|
|
77
23
|
}
|
|
78
24
|
}
|
|
79
|
-
|
|
80
|
-
Decidim.traceability.update!(
|
|
81
|
-
assembly_member,
|
|
82
|
-
form.current_user,
|
|
83
|
-
attributes,
|
|
84
|
-
log_info
|
|
85
|
-
)
|
|
86
25
|
end
|
|
87
26
|
end
|
|
88
27
|
end
|
|
@@ -17,13 +17,13 @@ module Decidim
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
def new
|
|
20
|
-
enforce_permission_to :create, :assembly
|
|
20
|
+
enforce_permission_to :create, :assembly
|
|
21
21
|
@form = form(AssemblyForm).instance
|
|
22
22
|
@form.parent_id = params[:parent_id]
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
def create
|
|
26
|
-
enforce_permission_to :create, :assembly
|
|
26
|
+
enforce_permission_to :create, :assembly
|
|
27
27
|
@form = form(AssemblyForm).from_params(params)
|
|
28
28
|
|
|
29
29
|
CreateAssembly.call(@form) do
|
|
@@ -52,7 +52,7 @@ module Decidim
|
|
|
52
52
|
assembly_id: current_assembly.id
|
|
53
53
|
)
|
|
54
54
|
|
|
55
|
-
UpdateAssembly.call(
|
|
55
|
+
UpdateAssembly.call(@form, current_assembly) do
|
|
56
56
|
on(:ok) do |assembly|
|
|
57
57
|
flash[:notice] = I18n.t("assemblies.update.success", scope: "decidim.admin")
|
|
58
58
|
redirect_to edit_assembly_path(assembly)
|
|
@@ -66,7 +66,7 @@ module Decidim
|
|
|
66
66
|
end
|
|
67
67
|
|
|
68
68
|
def copy
|
|
69
|
-
enforce_permission_to :create, :assembly
|
|
69
|
+
enforce_permission_to :create, :assembly
|
|
70
70
|
end
|
|
71
71
|
|
|
72
72
|
private
|
|
@@ -84,22 +84,7 @@ module Decidim
|
|
|
84
84
|
alias current_participatory_space current_assembly
|
|
85
85
|
|
|
86
86
|
def parent_assembly
|
|
87
|
-
@parent_assembly ||= collection.find_by(id:
|
|
88
|
-
end
|
|
89
|
-
|
|
90
|
-
def parent_assembly_id
|
|
91
|
-
# Return the parent_id from Ransack parameters if it exists
|
|
92
|
-
return ransack_params[:parent_id_eq] if ransack_params[:parent_id_eq].present?
|
|
93
|
-
|
|
94
|
-
# If the assembly parameter is present, return its parent_id
|
|
95
|
-
return assembly_parent_id if params[:assembly].present?
|
|
96
|
-
|
|
97
|
-
# Otherwise, return the parent_id from the params hash
|
|
98
|
-
params[:parent_id]
|
|
99
|
-
end
|
|
100
|
-
|
|
101
|
-
def assembly_parent_id
|
|
102
|
-
params[:assembly][:parent_id]
|
|
87
|
+
@parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
|
|
103
88
|
end
|
|
104
89
|
|
|
105
90
|
def assembly_params
|
|
@@ -5,8 +5,8 @@ module Decidim
|
|
|
5
5
|
module Admin
|
|
6
6
|
# Controller used to manage the available assemblies types for the current
|
|
7
7
|
# organization.
|
|
8
|
-
# As this
|
|
9
|
-
# and
|
|
8
|
+
# As this substitutes former i18n simple hash we need to keep these i18n keys for migrations
|
|
9
|
+
# and rollbacks. So let i18n-tasks know about:
|
|
10
10
|
# i18n-tasks-use t('decidim.assemblies.assembly_types.government')
|
|
11
11
|
# i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
|
|
12
12
|
# i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
|
|
@@ -63,7 +63,7 @@ module Decidim
|
|
|
63
63
|
@form = assembly_type_form
|
|
64
64
|
.from_params(params, assembly_type: current_assembly_type)
|
|
65
65
|
|
|
66
|
-
UpdateAssembliesType.call(
|
|
66
|
+
UpdateAssembliesType.call(@form, current_assembly_type) do
|
|
67
67
|
on(:ok) do
|
|
68
68
|
flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
|
|
69
69
|
redirect_to assemblies_types_path
|
|
@@ -80,7 +80,7 @@ module Decidim
|
|
|
80
80
|
def destroy
|
|
81
81
|
enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
|
|
82
82
|
|
|
83
|
-
|
|
83
|
+
Decidim::Commands::DestroyResource.call(current_assembly_type, current_user) do
|
|
84
84
|
on(:ok) do
|
|
85
85
|
flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
|
|
86
86
|
redirect_to assemblies_types_path
|
|
@@ -23,7 +23,7 @@ module Decidim
|
|
|
23
23
|
enforce_permission_to :create, :assembly_member
|
|
24
24
|
@form = form(AssemblyMemberForm).from_params(params)
|
|
25
25
|
|
|
26
|
-
CreateAssemblyMember.call(@form
|
|
26
|
+
CreateAssemblyMember.call(@form) do
|
|
27
27
|
on(:ok) do
|
|
28
28
|
flash[:notice] = I18n.t("assembly_members.create.success", scope: "decidim.admin")
|
|
29
29
|
redirect_to assembly_members_path(current_assembly)
|
data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
CHANGED
|
@@ -4,7 +4,7 @@ module Decidim
|
|
|
4
4
|
module Assemblies
|
|
5
5
|
module Admin
|
|
6
6
|
# Controller that allows managing assembly private users
|
|
7
|
-
# on
|
|
7
|
+
# on assemblies
|
|
8
8
|
class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::Admin::ApplicationController
|
|
9
9
|
include Concerns::AssemblyAdmin
|
|
10
10
|
include Decidim::Admin::Concerns::HasPrivateUsers
|
|
@@ -4,7 +4,7 @@ module Decidim
|
|
|
4
4
|
module Assemblies
|
|
5
5
|
module Admin
|
|
6
6
|
# Controller that allows importing assembly private users
|
|
7
|
-
# on
|
|
7
|
+
# on assemblies
|
|
8
8
|
class ParticipatorySpacePrivateUsersCsvImportsController < Decidim::Admin::ApplicationController
|
|
9
9
|
include Concerns::AssemblyAdmin
|
|
10
10
|
include Decidim::Admin::Concerns::HasPrivateUsersCsvImport
|
|
@@ -2,7 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
module Decidim
|
|
4
4
|
module Assemblies
|
|
5
|
-
# The main
|
|
5
|
+
# The main application controller for assemblies
|
|
6
|
+
#
|
|
7
|
+
# This controller is the abstract class from which all other controllers of
|
|
8
|
+
# this engine inherit.
|
|
6
9
|
class ApplicationController < Decidim::ApplicationController
|
|
7
10
|
helper Decidim::ApplicationHelper
|
|
8
11
|
helper Decidim::Assemblies::AssembliesHelper
|
|
@@ -6,9 +6,6 @@ module Decidim
|
|
|
6
6
|
class AssembliesController < Decidim::Assemblies::ApplicationController
|
|
7
7
|
include ParticipatorySpaceContext
|
|
8
8
|
include AssemblyBreadcrumb
|
|
9
|
-
|
|
10
|
-
participatory_space_layout only: :show
|
|
11
|
-
|
|
12
9
|
include FilterResource
|
|
13
10
|
include Paginable
|
|
14
11
|
include HasParticipatorySpaceContentBlocks
|
|
@@ -51,7 +51,6 @@ module Decidim
|
|
|
51
51
|
attribute :is_transparent, Boolean
|
|
52
52
|
attribute :promoted, Boolean
|
|
53
53
|
attribute :private_space, Boolean
|
|
54
|
-
attribute :show_statistics, Boolean
|
|
55
54
|
attribute :scopes_enabled, Boolean
|
|
56
55
|
|
|
57
56
|
attribute :closing_date, Decidim::Attributes::LocalizedDate
|
|
@@ -12,32 +12,6 @@ module Decidim
|
|
|
12
12
|
include Decidim::FiltersHelper
|
|
13
13
|
include FilterAssembliesHelper
|
|
14
14
|
|
|
15
|
-
# Public: Returns the characteristics of an assembly in a readable format like
|
|
16
|
-
# "title: close, no public, no transparent and is restricted to the members of the assembly"
|
|
17
|
-
# deprecated
|
|
18
|
-
def participatory_processes_for_assembly(assembly_participatory_processes)
|
|
19
|
-
html = ""
|
|
20
|
-
html += %( <div class="section"> ).html_safe
|
|
21
|
-
html += %( <h4>#{t("assemblies.show.related_participatory_processes", scope: "decidim")}</h4> ).html_safe
|
|
22
|
-
html += %( <div class="row small-up-1 medium-up-2 card-grid"> ).html_safe
|
|
23
|
-
assembly_participatory_processes.each do |assembly_participatory_process|
|
|
24
|
-
html += render partial: "decidim/participatory_processes/participatory_process", locals: { participatory_process: assembly_participatory_process }
|
|
25
|
-
end
|
|
26
|
-
html += %( </div> ).html_safe
|
|
27
|
-
html += %( </div> ).html_safe
|
|
28
|
-
|
|
29
|
-
html.html_safe
|
|
30
|
-
end
|
|
31
|
-
|
|
32
|
-
def assembly_features(assembly)
|
|
33
|
-
html = "".html_safe
|
|
34
|
-
html += "<strong>#{translated_attribute(assembly.title)}: </strong>".html_safe
|
|
35
|
-
html += t("assemblies.show.private_space", scope: "decidim").to_s.html_safe
|
|
36
|
-
html += ", #{t("assemblies.show.is_transparent.#{assembly.is_transparent}", scope: "decidim")}".html_safe if assembly.is_transparent?
|
|
37
|
-
html += " #{decidim_sanitize_editor translated_attribute(assembly.special_features)}".html_safe
|
|
38
|
-
html.html_safe
|
|
39
|
-
end
|
|
40
|
-
|
|
41
15
|
# Items to display in the navigation of an assembly
|
|
42
16
|
def assembly_nav_items(participatory_space)
|
|
43
17
|
components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
|
|
@@ -145,7 +145,7 @@ module Decidim
|
|
|
145
145
|
end
|
|
146
146
|
|
|
147
147
|
# All users with a relation to an assembly and organization admins can enter
|
|
148
|
-
# the space area. The
|
|
148
|
+
# the space area. The space area is considered to be the assemblies zone,
|
|
149
149
|
# not the assembly groups one.
|
|
150
150
|
def user_can_enter_space_area?
|
|
151
151
|
return unless permission_action.action == :enter &&
|
|
@@ -176,7 +176,7 @@ module Decidim
|
|
|
176
176
|
return unless permission_action.action == :create &&
|
|
177
177
|
permission_action.subject == :assembly
|
|
178
178
|
|
|
179
|
-
toggle_allow(user.admin? || admin_assembly?)
|
|
179
|
+
toggle_allow(user.admin? || admin_assembly? || user_role == "admin")
|
|
180
180
|
end
|
|
181
181
|
|
|
182
182
|
def user_can_export_assembly?
|
|
@@ -36,7 +36,6 @@ module Decidim
|
|
|
36
36
|
target: attributes["target"],
|
|
37
37
|
participatory_scope: attributes["participatory_scope"],
|
|
38
38
|
participatory_structure: attributes["participatory_structure"],
|
|
39
|
-
show_statistics: attributes["show_statistics"],
|
|
40
39
|
scopes_enabled: attributes["scopes_enabled"],
|
|
41
40
|
private_space: attributes["private_space"],
|
|
42
41
|
reference: attributes["reference"],
|
|
@@ -33,9 +33,8 @@ module Decidim
|
|
|
33
33
|
local_area: assembly.local_area,
|
|
34
34
|
target: assembly.target,
|
|
35
35
|
decidim_scope_id: assembly.decidim_scope_id,
|
|
36
|
-
paticipatory_scope: assembly.participatory_scope,
|
|
36
|
+
paticipatory_scope: assembly.participatory_scope, # intentionally misspelled
|
|
37
37
|
participatory_structure: assembly.participatory_structure,
|
|
38
|
-
show_statistics: assembly.show_statistics,
|
|
39
38
|
scopes_enabled: assembly.scopes_enabled,
|
|
40
39
|
private_space: assembly.private_space,
|
|
41
40
|
reference: assembly.reference,
|
|
@@ -181,17 +181,17 @@
|
|
|
181
181
|
</div>
|
|
182
182
|
</div>
|
|
183
183
|
|
|
184
|
-
<div class="card" data-component="accordion" id="accordion-
|
|
184
|
+
<div class="card" data-component="accordion" id="accordion-visibility">
|
|
185
185
|
<div class="card-divider">
|
|
186
|
-
<button class="card-divider-button" data-open="true" data-controls="panel-
|
|
186
|
+
<button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
|
|
187
187
|
<%= icon "arrow-right-s-line" %>
|
|
188
|
-
<h2 class="card-title" id="
|
|
189
|
-
<%= t("
|
|
188
|
+
<h2 class="card-title" id="visibility">
|
|
189
|
+
<%= t("visibility", scope: "decidim.assemblies.admin.assemblies.form") %>
|
|
190
190
|
</h2>
|
|
191
191
|
</button>
|
|
192
192
|
</div>
|
|
193
193
|
|
|
194
|
-
<div id="panel-
|
|
194
|
+
<div id="panel-visibility" class="card-section">
|
|
195
195
|
<% if params[:parent_id].present? %>
|
|
196
196
|
<%= form.hidden_field :parent_id, value: @form.parent_id %>
|
|
197
197
|
<% else %>
|
|
@@ -273,10 +273,6 @@
|
|
|
273
273
|
label: t("social_handlers",
|
|
274
274
|
scope: "decidim.assemblies.admin.assemblies.form") %>
|
|
275
275
|
</div>
|
|
276
|
-
|
|
277
|
-
<div class="row column">
|
|
278
|
-
<%= form.check_box :show_statistics %>
|
|
279
|
-
</div>
|
|
280
276
|
</div>
|
|
281
277
|
</div>
|
|
282
278
|
</div>
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
<% else %>
|
|
78
78
|
<span class="action-space icon"></span>
|
|
79
79
|
<% end %>
|
|
80
|
-
<% if assembly.children.count.positive? || allowed_to?(:
|
|
80
|
+
<% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
|
|
81
81
|
<%= icon_link_to "government-line",
|
|
82
82
|
url_for(query_params_with(parent_id_eq: assembly.id)),
|
|
83
83
|
t("decidim.admin.titles.assemblies"),
|
|
@@ -85,7 +85,7 @@
|
|
|
85
85
|
<% else %>
|
|
86
86
|
<span class="action-space icon"></span>
|
|
87
87
|
<% end %>
|
|
88
|
-
|
|
88
|
+
<% if allowed_to? :copy, :assembly, assembly: assembly %>
|
|
89
89
|
<%= icon_link_to "file-copy-line", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
|
|
90
90
|
<% else %>
|
|
91
91
|
<span class="action-space icon"></span>
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<th><%= t("models.assembly_member.fields.position", scope: "decidim.admin") %></th>
|
|
19
19
|
<th><%= t("models.assembly_member.fields.designation_date", scope: "decidim.admin") %></th>
|
|
20
20
|
<th><%= t("models.assembly_member.fields.ceased_date", scope: "decidim.admin") %></th>
|
|
21
|
-
<th
|
|
21
|
+
<th></th>
|
|
22
22
|
</tr>
|
|
23
23
|
</thead>
|
|
24
24
|
<tbody>
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
<th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
|
|
19
19
|
<th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
|
|
20
20
|
<th><%= sort_link(query, :role, t("models.assembly_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
|
|
21
|
-
<th
|
|
21
|
+
<th></th>
|
|
22
22
|
</tr>
|
|
23
23
|
</thead>
|
|
24
24
|
<tbody>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<% add_decidim_meta_tags({
|
|
2
|
-
|
|
2
|
+
title: translated_attribute(current_participatory_space.title),
|
|
3
|
+
image_url: current_participatory_space.attached_uploader(:hero_image).path,
|
|
3
4
|
description: translated_attribute(current_participatory_space.short_description),
|
|
4
|
-
url: assembly_url(current_participatory_space)
|
|
5
|
-
twitter_handler: current_organization.twitter_handler
|
|
5
|
+
url: assembly_url(current_participatory_space)
|
|
6
6
|
}) %>
|
|
7
7
|
|
|
8
8
|
<%
|
|
@@ -14,23 +14,27 @@ edit_link(
|
|
|
14
14
|
)
|
|
15
15
|
%>
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
<section class="participatory-space__block-reference alert">
|
|
19
|
-
<%= t("private_space", scope: "decidim.assemblies.show") %>
|
|
20
|
-
</section>
|
|
21
|
-
<% end %>
|
|
17
|
+
<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
|
|
22
18
|
|
|
23
|
-
<
|
|
19
|
+
<main>
|
|
20
|
+
<% if current_participatory_space.private_space? %>
|
|
21
|
+
<section class="participatory-space__block-reference alert">
|
|
22
|
+
<%= t("private_space", scope: "decidim.assemblies.show") %>
|
|
23
|
+
</section>
|
|
24
|
+
<% end %>
|
|
24
25
|
|
|
25
|
-
|
|
26
|
+
<div class="participatory-space__container">
|
|
26
27
|
|
|
27
|
-
|
|
28
|
-
<% next unless content_block.manifest %>
|
|
29
|
-
<%= cell content_block.manifest.cell, content_block %>
|
|
30
|
-
<% end %>
|
|
28
|
+
<%= participatory_space_floating_help %>
|
|
31
29
|
|
|
32
|
-
|
|
30
|
+
<% active_content_blocks.each do |content_block| %>
|
|
31
|
+
<% next unless content_block.manifest %>
|
|
32
|
+
<%= cell content_block.manifest.cell, content_block %>
|
|
33
|
+
<% end %>
|
|
33
34
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
</div>
|
|
36
|
+
|
|
37
|
+
<section class="participatory-space__block-reference">
|
|
38
|
+
<%= resource_reference(current_participatory_space) %>
|
|
39
|
+
</section>
|
|
40
|
+
</main>
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
<%
|
|
1
|
+
<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
|
|
2
|
+
<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
|
|
2
3
|
|
|
3
4
|
<%
|
|
4
5
|
edit_link(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<% content_for :breadcrumb_context_menu do %>
|
|
2
2
|
<div class="process-title-content-breadcrumb-container-right">
|
|
3
|
-
<% if allowed_to? :create, :assembly
|
|
3
|
+
<% if allowed_to? :create, :assembly %>
|
|
4
4
|
<% link = defined?(parent_assembly) ? new_assembly_path(parent_id: parent_assembly&.id) : new_assembly_path %>
|
|
5
5
|
<%= link_to link, class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
|
|
6
6
|
<%= icon "add-line", class: "w-4 h-4" %>
|
data/config/locales/ar.yml
CHANGED
|
@@ -51,7 +51,6 @@ ar:
|
|
|
51
51
|
scope_id: نطاق
|
|
52
52
|
scopes_enabled: النطاقات المُفعّلَة
|
|
53
53
|
short_description: وصف قصير
|
|
54
|
-
show_statistics: عرض الإحصائيات
|
|
55
54
|
slug: سبيكة العنوان الشبكي
|
|
56
55
|
special_features: مميزات خاصة
|
|
57
56
|
subtitle: العنوان الفرعي
|
|
@@ -290,7 +289,6 @@ ar:
|
|
|
290
289
|
form:
|
|
291
290
|
existing_user: المشارك الحالي
|
|
292
291
|
explanation: 'إرشادات للصورة:'
|
|
293
|
-
image_guide: يفضل أن تكون صورة لا تحتوي على أي نص.
|
|
294
292
|
non_user: غير مشارك
|
|
295
293
|
non_user_avatar_help: يجب أن تحصل على موافقة الأشخاص قبل نشرهم كأعضاء.
|
|
296
294
|
select_a_position: اختر المنصب
|
|
@@ -349,11 +347,7 @@ ar:
|
|
|
349
347
|
show:
|
|
350
348
|
assembly_type: نوع الجمعية
|
|
351
349
|
duration: المدة الزمنية
|
|
352
|
-
is_transparent:
|
|
353
|
-
'false': مبهمة
|
|
354
|
-
'true': شفافة
|
|
355
350
|
private_space: هذه جمعية خاصة
|
|
356
|
-
related_participatory_processes: العمليات التشاركية ذات الصلة
|
|
357
351
|
social_networks_title: زيارة التجمع على
|
|
358
352
|
assembly_members:
|
|
359
353
|
assembly_member:
|
data/config/locales/bg.yml
CHANGED
|
@@ -51,7 +51,6 @@ bg:
|
|
|
51
51
|
scope_id: Обхват
|
|
52
52
|
scopes_enabled: Обхватите са активирани
|
|
53
53
|
short_description: Кратко описание
|
|
54
|
-
show_statistics: Покажи статистиката
|
|
55
54
|
slug: Съкратен URL
|
|
56
55
|
special_features: Специални функции
|
|
57
56
|
subtitle: Подзаглавие
|
|
@@ -296,7 +295,7 @@ bg:
|
|
|
296
295
|
slug_help_html: 'Използват се променливи полета в URL адреса, за да се генерират URL адреси, които водят към това събрание. Допуска се използването само на букви, цифри и тирета и адресът трябва да започва с буква. Пример: %{url}'
|
|
297
296
|
social_handlers: Социални мрежи
|
|
298
297
|
title: Основна информация
|
|
299
|
-
|
|
298
|
+
visibility: Видимост
|
|
300
299
|
assemblies_types:
|
|
301
300
|
form:
|
|
302
301
|
title: Редактиране на типа събрание
|
|
@@ -310,7 +309,7 @@ bg:
|
|
|
310
309
|
form:
|
|
311
310
|
existing_user: Съществуващ участник
|
|
312
311
|
explanation: 'Указания за изображението:'
|
|
313
|
-
image_guide: За предпочитане
|
|
312
|
+
image_guide: За предпочитане е портретно (вертикално) изображение без текст.
|
|
314
313
|
non_user: Не е участник
|
|
315
314
|
non_user_avatar_help: Трябва да получите съгласието на лицата, преди да ги публикувате като членове.
|
|
316
315
|
select_a_position: Изберете длъжност
|
|
@@ -396,11 +395,7 @@ bg:
|
|
|
396
395
|
show:
|
|
397
396
|
assembly_type: Тип събрание
|
|
398
397
|
duration: Продължителност
|
|
399
|
-
is_transparent:
|
|
400
|
-
'false': непрозрачно
|
|
401
|
-
'true': прозрачно
|
|
402
398
|
private_space: Това е частно събрание
|
|
403
|
-
related_participatory_processes: Свързани процеси за участие
|
|
404
399
|
social_networks_title: Посетете събранието на
|
|
405
400
|
assembly_members:
|
|
406
401
|
assembly_member:
|
data/config/locales/ca.yml
CHANGED
|
@@ -40,7 +40,7 @@ ca:
|
|
|
40
40
|
is_transparent: És transparent
|
|
41
41
|
local_area: Àrea d'organització
|
|
42
42
|
meta_scope: Metadades d'àmbit
|
|
43
|
-
parent_id: Assemblea
|
|
43
|
+
parent_id: Assemblea principal
|
|
44
44
|
participatory_processes_ids: Processos participatius relacionats
|
|
45
45
|
participatory_scope: Què es decideix?
|
|
46
46
|
participatory_structure: Com es decideix
|
|
@@ -51,7 +51,6 @@ ca:
|
|
|
51
51
|
scope_id: Àmbit
|
|
52
52
|
scopes_enabled: Àmbits habilitats
|
|
53
53
|
short_description: Descripció breu
|
|
54
|
-
show_statistics: Mostra estadístiques
|
|
55
54
|
slug: Nom curt d'URL
|
|
56
55
|
special_features: Característiques especials
|
|
57
56
|
subtitle: Subtítol
|
|
@@ -207,7 +206,7 @@ ca:
|
|
|
207
206
|
attachments: Adjunts
|
|
208
207
|
categories: Categories
|
|
209
208
|
components: Components
|
|
210
|
-
info:
|
|
209
|
+
info: Sobre aquesta assemblea
|
|
211
210
|
landing_page: Pàgina d'inici
|
|
212
211
|
moderations: Moderacions
|
|
213
212
|
private_users: Participants privades
|
|
@@ -293,11 +292,11 @@ ca:
|
|
|
293
292
|
select_a_created_by: Selecciona una creadora
|
|
294
293
|
select_an_area: Selecciona una Àrea
|
|
295
294
|
select_an_assembly_type: Selecciona un tipus d'assemblea
|
|
296
|
-
select_parent_assembly: Selecciona una assemblea
|
|
295
|
+
select_parent_assembly: Selecciona una assemblea principal
|
|
297
296
|
slug_help_html: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
|
|
298
297
|
social_handlers: Social
|
|
299
298
|
title: Informació general
|
|
300
|
-
|
|
299
|
+
visibility: Visibilitat
|
|
301
300
|
assemblies_types:
|
|
302
301
|
form:
|
|
303
302
|
title: Títol
|
|
@@ -339,13 +338,13 @@ ca:
|
|
|
339
338
|
participatory_scope: Què es decideix
|
|
340
339
|
participatory_structure: Com es decideix
|
|
341
340
|
target: Qui participa
|
|
342
|
-
title:
|
|
341
|
+
title: Sobre aquesta assemblea
|
|
343
342
|
filters:
|
|
344
343
|
names:
|
|
345
344
|
all: Totes
|
|
346
345
|
type: Tipus
|
|
347
346
|
show:
|
|
348
|
-
title:
|
|
347
|
+
title: Sobre aquesta assemblea
|
|
349
348
|
assembly_members:
|
|
350
349
|
index:
|
|
351
350
|
members: Membres
|
|
@@ -397,11 +396,7 @@ ca:
|
|
|
397
396
|
show:
|
|
398
397
|
assembly_type: Tipus d'assemblea
|
|
399
398
|
duration: Durada
|
|
400
|
-
is_transparent:
|
|
401
|
-
'false': opaca
|
|
402
|
-
'true': transparent
|
|
403
399
|
private_space: Aquesta és una assemblea privada
|
|
404
|
-
related_participatory_processes: Processos participatius relacionats
|
|
405
400
|
social_networks_title: Visita l'assemblea a
|
|
406
401
|
assembly_members:
|
|
407
402
|
assembly_member:
|
data/config/locales/cs.yml
CHANGED
|
@@ -51,7 +51,6 @@ cs:
|
|
|
51
51
|
scope_id: Oblast působnosti
|
|
52
52
|
scopes_enabled: Oblasti působnosti povoleny
|
|
53
53
|
short_description: Stručný popis
|
|
54
|
-
show_statistics: Zobrazit statistiky
|
|
55
54
|
slug: URL slug
|
|
56
55
|
special_features: Speciální funkce
|
|
57
56
|
subtitle: Podtitul
|
|
@@ -303,7 +302,7 @@ cs:
|
|
|
303
302
|
slug_help_html: 'URL slugy se používají ke generování adres URL, které odkazují na toto shromáždění. Povolená jsou pouze písmena, číslice a pomlčky a musí začínat písmenem. Příklad: %{url}'
|
|
304
303
|
social_handlers: Sociální
|
|
305
304
|
title: Obecná informace
|
|
306
|
-
|
|
305
|
+
visibility: Viditelnost
|
|
307
306
|
assemblies_types:
|
|
308
307
|
form:
|
|
309
308
|
title: Titul
|
|
@@ -403,11 +402,7 @@ cs:
|
|
|
403
402
|
show:
|
|
404
403
|
assembly_type: Typ shromáždění
|
|
405
404
|
duration: Doba trvání
|
|
406
|
-
is_transparent:
|
|
407
|
-
'false': neprůhledný
|
|
408
|
-
'true': transparentní
|
|
409
405
|
private_space: Toto je soukromé shromáždění
|
|
410
|
-
related_participatory_processes: Související participativní procesy
|
|
411
406
|
social_networks_title: Navštivte shromáždění na
|
|
412
407
|
assembly_members:
|
|
413
408
|
assembly_member:
|