decidim-assemblies 0.28.5 → 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.
Files changed (92) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/assemblies/assembly_g_cell.rb +2 -2
  3. data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb +0 -4
  4. data/app/cells/decidim/assemblies/content_blocks/stats_cell.rb +1 -1
  5. data/app/commands/decidim/assemblies/admin/create_assemblies_type.rb +3 -31
  6. data/app/commands/decidim/assemblies/admin/create_assembly.rb +30 -89
  7. data/app/commands/decidim/assemblies/admin/create_assembly_member.rb +14 -66
  8. data/app/commands/decidim/assemblies/admin/destroy_assembly_member.rb +5 -37
  9. data/app/commands/decidim/assemblies/admin/import_assembly.rb +1 -1
  10. data/app/commands/decidim/assemblies/admin/update_assemblies_type.rb +2 -35
  11. data/app/commands/decidim/assemblies/admin/update_assembly.rb +22 -99
  12. data/app/commands/decidim/assemblies/admin/update_assembly_member.rb +8 -69
  13. data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +5 -20
  14. data/app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb +4 -4
  15. data/app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb +0 -6
  16. data/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb +1 -1
  17. data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb +1 -1
  18. data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb +1 -1
  19. data/app/controllers/decidim/assemblies/application_controller.rb +4 -1
  20. data/app/controllers/decidim/assemblies/assemblies_controller.rb +0 -3
  21. data/app/controllers/decidim/assemblies/assembly_members_controller.rb +0 -2
  22. data/app/forms/decidim/assemblies/admin/assembly_form.rb +8 -9
  23. data/app/helpers/decidim/assemblies/assemblies_helper.rb +0 -26
  24. data/app/models/decidim/assembly.rb +1 -6
  25. data/app/permissions/decidim/assemblies/permissions.rb +2 -2
  26. data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb +0 -1
  27. data/app/presenters/decidim/assemblies/assembly_presenter.rb +2 -2
  28. data/app/serializers/decidim/assemblies/assembly_importer.rb +0 -1
  29. data/app/serializers/decidim/assemblies/assembly_serializer.rb +1 -2
  30. data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +5 -9
  31. data/app/views/decidim/assemblies/admin/assemblies/index.html.erb +2 -2
  32. data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb +1 -1
  33. data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb +1 -1
  34. data/app/views/decidim/assemblies/assemblies/show.html.erb +22 -18
  35. data/app/views/decidim/assemblies/assembly_members/index.html.erb +2 -1
  36. data/app/views/layouts/decidim/admin/assemblies.html.erb +1 -1
  37. data/config/locales/ar.yml +7 -14
  38. data/config/locales/bg.yml +2 -7
  39. data/config/locales/ca.yml +9 -14
  40. data/config/locales/cs.yml +3 -8
  41. data/config/locales/de.yml +20 -25
  42. data/config/locales/el.yml +0 -6
  43. data/config/locales/en.yml +2 -7
  44. data/config/locales/es-MX.yml +6 -11
  45. data/config/locales/es-PY.yml +5 -10
  46. data/config/locales/es.yml +8 -13
  47. data/config/locales/eu.yml +48 -53
  48. data/config/locales/fi-plain.yml +6 -11
  49. data/config/locales/fi.yml +10 -15
  50. data/config/locales/fr-CA.yml +7 -12
  51. data/config/locales/fr.yml +7 -12
  52. data/config/locales/ga-IE.yml +0 -5
  53. data/config/locales/gl.yml +2 -10
  54. data/config/locales/he-IL.yml +0 -171
  55. data/config/locales/hu.yml +2 -8
  56. data/config/locales/id-ID.yml +0 -10
  57. data/config/locales/is-IS.yml +5 -9
  58. data/config/locales/it.yml +3 -11
  59. data/config/locales/ja.yml +3 -8
  60. data/config/locales/ko.yml +8 -1
  61. data/config/locales/lb.yml +5 -14
  62. data/config/locales/lt.yml +2 -8
  63. data/config/locales/lv.yml +0 -10
  64. data/config/locales/nl.yml +3 -11
  65. data/config/locales/no.yml +0 -8
  66. data/config/locales/pl.yml +3 -14
  67. data/config/locales/pt-BR.yml +0 -6
  68. data/config/locales/pt.yml +1 -9
  69. data/config/locales/ro-RO.yml +2 -12
  70. data/config/locales/ru.yml +6 -11
  71. data/config/locales/sk.yml +0 -20
  72. data/config/locales/sl.yml +0 -17
  73. data/config/locales/sq-AL.yml +5 -6
  74. data/config/locales/sv.yml +137 -203
  75. data/config/locales/tr-TR.yml +4 -9
  76. data/config/locales/uk.yml +5 -10
  77. data/config/locales/zh-CN.yml +0 -10
  78. data/config/locales/zh-TW.yml +1 -7
  79. data/db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb +11 -0
  80. data/decidim-assemblies.gemspec +2 -2
  81. data/lib/decidim/api/assembly_type.rb +5 -6
  82. data/lib/decidim/assemblies/content_blocks/registry_manager.rb +1 -1
  83. data/lib/decidim/assemblies/engine.rb +1 -0
  84. data/lib/decidim/assemblies/menu.rb +11 -0
  85. data/lib/decidim/assemblies/seeds.rb +1 -11
  86. data/lib/decidim/assemblies/test/factories.rb +0 -1
  87. data/lib/decidim/assemblies/version.rb +1 -1
  88. metadata +18 -21
  89. data/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb +0 -45
  90. data/app/views/layouts/decidim/assembly.html.erb +0 -18
  91. data/config/locales/bn-BD.yml +0 -1
  92. data/config/locales/bs-BA.yml +0 -44
@@ -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::Command
9
- include ::Decidim::AttachmentAttributesMethods
8
+ class UpdateAssemblyMember < Decidim::Commands::UpdateResource
9
+ fetch_file_attributes :non_user_avatar
10
10
 
11
- # Public: Initializes the command.
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
- attr_reader :form, :assembly_member
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: assembly_member.full_name
19
+ title: resource.full_name
74
20
  },
75
21
  participatory_space: {
76
- title: assembly_member.assembly.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, assembly: parent_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, assembly: parent_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(current_assembly, @form) do
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, assembly: collection.find_by(id: params[:parent_id])
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: parent_assembly_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 substitues former i18n simple hash we need to keep these i18n keys for migrations
9
- # and rollbakcs. So let i18n-tasks know about:
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(current_assembly_type, @form) do
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
- DestroyAssembliesType.call(current_assembly_type, current_user) do
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
@@ -10,8 +10,6 @@ module Decidim
10
10
 
11
11
  layout "decidim/admin/assemblies"
12
12
 
13
- helper_method :parent_assembly
14
-
15
13
  private
16
14
 
17
15
  def content_block_scope
@@ -31,10 +29,6 @@ module Decidim
31
29
  def resource_landing_page_content_block_path
32
30
  assembly_landing_page_content_block_path(scoped_resource, params[:id])
33
31
  end
34
-
35
- def parent_assembly
36
- scoped_resource.parent
37
- end
38
32
  end
39
33
  end
40
34
  end
@@ -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, current_user, current_assembly) do
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)
@@ -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 assembies
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 assembies
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 admin application controller for assemblies
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
@@ -6,8 +6,6 @@ module Decidim
6
6
  include ParticipatorySpaceContext
7
7
  include AssemblyBreadcrumb
8
8
 
9
- participatory_space_layout only: :index
10
-
11
9
  helper_method :collection
12
10
 
13
11
  def index
@@ -14,23 +14,23 @@ module Decidim
14
14
 
15
15
  mimic :assembly
16
16
 
17
- translatable_attribute :composition, Decidim::Attributes::RichText
18
- translatable_attribute :closing_date_reason, Decidim::Attributes::RichText
17
+ translatable_attribute :composition, String
18
+ translatable_attribute :closing_date_reason, String
19
19
  translatable_attribute :created_by_other, String
20
- translatable_attribute :description, Decidim::Attributes::RichText
20
+ translatable_attribute :description, String
21
21
  translatable_attribute :developer_group, String
22
- translatable_attribute :internal_organisation, Decidim::Attributes::RichText
22
+ translatable_attribute :internal_organisation, String
23
23
  translatable_attribute :local_area, String
24
24
  translatable_attribute :meta_scope, String
25
25
  translatable_attribute :participatory_scope, String
26
26
  translatable_attribute :participatory_structure, String
27
- translatable_attribute :purpose_of_action, Decidim::Attributes::RichText
28
- translatable_attribute :short_description, Decidim::Attributes::RichText
29
- translatable_attribute :special_features, Decidim::Attributes::RichText
27
+ translatable_attribute :purpose_of_action, String
28
+ translatable_attribute :short_description, String
29
+ translatable_attribute :special_features, String
30
30
  translatable_attribute :subtitle, String
31
31
  translatable_attribute :target, String
32
32
  translatable_attribute :title, String
33
- translatable_attribute :announcement, Decidim::Attributes::RichText
33
+ translatable_attribute :announcement, String
34
34
 
35
35
  attribute :created_by, String
36
36
  attribute :facebook_handler, String
@@ -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)))
@@ -122,11 +122,6 @@ module Decidim
122
122
  Decidim::Assemblies::AdminLog::AssemblyPresenter
123
123
  end
124
124
 
125
- # This is a overwrite for Decidim::ParticipatorySpaceResourceable.visible?
126
- def visible?
127
- published? && (!private_space? || (private_space? && is_transparent?))
128
- end
129
-
130
125
  def hashtag
131
126
  attributes["hashtag"].to_s.delete("#")
132
127
  end
@@ -154,7 +149,7 @@ module Decidim
154
149
  end
155
150
 
156
151
  def user_roles(role_name = nil)
157
- roles = Decidim::AssemblyUserRole.order_by_name.where(assembly: self_and_ancestors)
152
+ roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
158
153
  return roles if role_name.blank?
159
154
 
160
155
  roles.where(role: role_name)
@@ -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 sapce area is considered to be the assemblies zone,
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?
@@ -31,7 +31,6 @@ module Decidim
31
31
  reference: :string,
32
32
  scopes_enabled: :boolean,
33
33
  short_description: :i18n,
34
- show_statistics: :boolean,
35
34
  slug: :default,
36
35
  subtitle: :i18n,
37
36
  target: :i18n,
@@ -6,11 +6,11 @@ module Decidim
6
6
  include Decidim::TranslationsHelper
7
7
 
8
8
  def hero_image_url
9
- assembly.attached_uploader(:hero_image).url
9
+ assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
10
10
  end
11
11
 
12
12
  def banner_image_url
13
- assembly.attached_uploader(:banner_image).url
13
+ assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
14
14
  end
15
15
 
16
16
  def area_name
@@ -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-visbility">
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-visbility" type="button">
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="visbility">
189
- <%= t("visbility", scope: "decidim.assemblies.admin.assemblies.form") %>
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-visbility" class="card-section">
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?(:read, :assembly, assembly:) %>
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
- <% if allowed_to? :copy, :assembly, assembly: assembly, assembly: parent_assembly %>
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 class="actions"></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 class="actions"></th>
21
+ <th></th>
22
22
  </tr>
23
23
  </thead>
24
24
  <tbody>
@@ -1,8 +1,8 @@
1
1
  <% add_decidim_meta_tags({
2
- image_url: current_participatory_space.attached_uploader(:hero_image).url,
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
- <% if current_participatory_space.private_space? %>
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
- <div class="participatory-space__container">
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
- <%= participatory_space_floating_help %>
26
+ <div class="participatory-space__container">
26
27
 
27
- <% active_content_blocks.each do |content_block| %>
28
- <% next unless content_block.manifest %>
29
- <%= cell content_block.manifest.cell, content_block %>
30
- <% end %>
28
+ <%= participatory_space_floating_help %>
31
29
 
32
- </div>
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
- <section class="participatory-space__block-reference">
35
- <%= resource_reference(current_participatory_space) %>
36
- </section>
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
- <% add_decidim_meta_tags(title: t("assembly_members.index.title", scope: "decidim")) %>
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, assembly: parent_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" %>
@@ -48,10 +48,9 @@ ar:
48
48
  promoted: سلط الضوء
49
49
  published_at: نشرت في
50
50
  purpose_of_action: الغرض من العمل
51
- scope_id: النطاق
51
+ scope_id: نطاق
52
52
  scopes_enabled: النطاقات المُفعّلَة
53
53
  short_description: وصف قصير
54
- show_statistics: عرض الإحصائيات
55
54
  slug: سبيكة العنوان الشبكي
56
55
  special_features: مميزات خاصة
57
56
  subtitle: العنوان الفرعي
@@ -188,7 +187,7 @@ ar:
188
187
  success: تم تحديث المشرف على هذه الجمعية بنجاح.
189
188
  filters:
190
189
  decidim_assemblies_type_id_eq:
191
- label: نوع التجمع
190
+ label: نوع الجمعية
192
191
  menu:
193
192
  assemblies: الجمعيات
194
193
  assemblies_submenu:
@@ -200,7 +199,7 @@ ar:
200
199
  categories: الفئات
201
200
  components: المكونات
202
201
  moderations: الإعتدال
203
- assemblies_types: أنواع التجمّعات
202
+ assemblies_types: نوع التجمّعات
204
203
  models:
205
204
  assemblies_types:
206
205
  fields:
@@ -208,7 +207,6 @@ ar:
208
207
  title: العنوان
209
208
  assembly:
210
209
  fields:
211
- actions: الإجراءات
212
210
  created_at: تاريخ الإنشاء
213
211
  private: خاص
214
212
  promoted: سلط الضوء
@@ -220,7 +218,7 @@ ar:
220
218
  ceased_date: تاريخ التوقف
221
219
  designation_date: تاريخ التعيين
222
220
  full_name: الاسم
223
- position: الموقع
221
+ position: موضع
224
222
  name: عضو
225
223
  positions:
226
224
  other: آخر
@@ -291,7 +289,6 @@ ar:
291
289
  form:
292
290
  existing_user: المشارك الحالي
293
291
  explanation: 'إرشادات للصورة:'
294
- image_guide: يفضل أن تكون صورة لا تحتوي على أي نص.
295
292
  non_user: غير مشارك
296
293
  non_user_avatar_help: يجب أن تحصل على موافقة الأشخاص قبل نشرهم كأعضاء.
297
294
  select_a_position: اختر المنصب
@@ -316,9 +313,9 @@ ar:
316
313
  commission: اللجنة
317
314
  consultative_advisory: استشاري / الاستشارية
318
315
  executive: تنفيذية
319
- government: الحكومية
316
+ government: حكومية
320
317
  others: أخرى
321
- participatory: التشاركية
318
+ participatory: تشاركية
322
319
  working_group: فريق العمل
323
320
  content_blocks:
324
321
  children_assemblies:
@@ -348,13 +345,9 @@ ar:
348
345
  member_of:
349
346
  member_of: عضو في
350
347
  show:
351
- assembly_type: نوع التجمع
348
+ assembly_type: نوع الجمعية
352
349
  duration: المدة الزمنية
353
- is_transparent:
354
- 'false': مبهمة
355
- 'true': شفافة
356
350
  private_space: هذه جمعية خاصة
357
- related_participatory_processes: العمليات التشاركية ذات الصلة
358
351
  social_networks_title: زيارة التجمع على
359
352
  assembly_members:
360
353
  assembly_member: