decidim-assemblies 0.31.6 → 0.31.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64828a7f4f21fca487887ed8ae0983c9c20f5a2b5d2fd5951b6646843b4e9c7a
-  data.tar.gz: 0d998700246da81988c57552b9606746bb72c37978647b3590e6a8406314ede3
+  metadata.gz: 834c37a80060af9ef0ae034c1b6d1c70a4be1d683d88ce0b7dfcdba71a0306c1
+  data.tar.gz: eec0950f3a0b1dc4df44248647ec0194c29fe5451f94ecdcba674dfb6539861c
 SHA512:
-  metadata.gz: e0493ded159407b56415466e04e177ebadd8d21524445b598d1a17bdeeed6cfa76d28da407eaab122bf5f1c7709ba1cb088ebc95ae62255341dcfbfa37372fa5
-  data.tar.gz: 40a862c95c34053d6366555e8e0dfba9d5250fce94331532775b68587570cceaf0b0f7f413898cc410de7b91e3c91d96c8a44389e9a7b5bea2afee5a4af03a97
+  metadata.gz: 7ea29cb86748c9ffd6f3f03e5a35f7241a7e82d31fa29475443421545367c96b7c5a7338cb0575c87a252d2fbe5b934ee72e4abf67d5d1d1c50c3672355fc5ef
+  data.tar.gz: 879d9eeb1d3d477447098b53e82fc72423c4f340a4c00d2ba189fd57b289abacba6aa435348657c40b93be298fbd7d8f3bee44396dd4c82cf1a75448a90aa738

data/app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb

@@ -10,6 +10,8 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachmentCollections
         include Decidim::Admin::Concerns::HasTabbedMenu
 
+        protected
+
         def after_destroy_path
           assembly_attachment_collections_path(current_assembly)
         end

data/app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb

@@ -11,6 +11,8 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachments
         include Decidim::Admin::Concerns::HasTabbedMenu
 
+        protected
+
         def after_destroy_path
           assembly_attachments_path(current_assembly)
         end

data/app/controllers/decidim/assemblies/admin/assembly_exports_controller.rb

@@ -7,6 +7,8 @@ module Decidim
         include Concerns::AssemblyAdmin
         include Decidim::Admin::ParticipatorySpaceExport
 
+        protected
+
         def exportable_space
           current_assembly
         end

data/app/controllers/decidim/assemblies/admin/assembly_landing_page_controller.rb

@@ -10,12 +10,18 @@ module Decidim
 
         layout "decidim/admin/assembly"
 
+        helper_method :scoped_resource
+
+        def scoped_resource
+          current_participatory_space
+        end
+
+        protected
+
         def content_block_scope
           current_participatory_space_manifest.content_blocks_scope_name
         end
 
-        alias scoped_resource current_participatory_space
-
         def enforce_permission_to_update_resource
           enforce_permission_to :update, :assembly, assembly: scoped_resource
         end

data/app/controllers/decidim/assemblies/admin/assembly_share_tokens_controller.rb

@@ -9,6 +9,8 @@ module Decidim
       class AssemblyShareTokensController < Decidim::Admin::ShareTokensController
         include Concerns::AssemblyAdmin
 
+        protected
+
         def resource
           current_assembly
         end

data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb

@@ -8,6 +8,8 @@ module Decidim
       class AssemblyUserRolesController < Decidim::Admin::ParticipatorySpace::UserRoleController
         include Concerns::AssemblyAdmin
 
+        protected
+
         def authorization_scope = :assembly_user_role
 
         def resource_form = form(AssemblyUserRoleForm)

data/app/controllers/decidim/assemblies/admin/component_share_tokens_controller.rb

@@ -9,6 +9,8 @@ module Decidim
       class ComponentShareTokensController < Decidim::Admin::ShareTokensController
         include Concerns::AssemblyAdmin
 
+        protected
+
         def resource
           @resource ||= current_participatory_space.components.find(params[:component_id])
         end

data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb

@@ -19,19 +19,22 @@ module Decidim
 
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
-            helper_method :current_assembly
+
+            helper_method :current_assembly, :current_participatory_space
             add_breadcrumb_item_from_menu :admin_assembly_menu
 
             participatory_space_admin_layout
 
+            def current_participatory_space = current_assembly
+
+            protected
+
             def current_assembly
               @current_assembly ||= organization_assemblies.find_by!(
                 slug: params[:assembly_slug] || params[:slug]
               )
             end
 
-            alias_method :current_participatory_space, :current_assembly
-
             def organization_assemblies
               @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
             end

data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb

@@ -9,6 +9,8 @@ module Decidim
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasPrivateUsers
 
+        protected
+
         def after_destroy_path
           participatory_space_private_users_path(current_assembly)
         end

data/app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb

@@ -9,6 +9,8 @@ module Decidim
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasPrivateUsersCsvImport
 
+        protected
+
         def after_import_path
           participatory_space_private_users_path(current_assembly)
         end

data/app/controllers/decidim/assemblies/participatory_space_private_users_controller.rb

@@ -5,10 +5,12 @@ module Decidim
     class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       include Decidim::HasMembersPage
+      include Paginable
 
       def index
         raise ActionController::RoutingError, "No members for this assembly" if members.none?
 
+        @members = paginate(members)
         enforce_permission_to :list, :members
         redirect_to decidim_assemblies.assembly_path(current_participatory_space) unless can_visit_index?
       end
@@ -22,6 +24,13 @@ module Decidim
           OrganizationAssemblies.new(current_organization).query.where(id: params[:assembly_slug])
         ).first!
       end
+
+      def page_params
+        {
+          per_page:,
+          page: params[:page]
+        }
+      end
     end
   end
 end

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -30,7 +30,7 @@ module Decidim
            )
         ] + components.map do |component|
           {
-            name: decidim_escape_translated(component.name),
+            name: translated_attribute(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -33,7 +33,7 @@ edit_link(
 
   </div>
 
-  <section class="participatory-space__block-reference">
+  <section class="participatory-space__block-reference" aria-label="<%= t("reference", scope: "decidim.participatory_space.labels") %>">
     <p><%= resource_reference(current_participatory_space) %></p>
   </section>
 </main>

data/app/views/decidim/assemblies/participatory_space_private_users/index.html.erb

@@ -20,4 +20,6 @@ edit_link(
   <div id="assembly_members-grid" class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
     <%= render(collection) %>
   </div>
+
+  <%= decidim_paginate @members %>
 </div>

data/config/locales/ca.yml

@@ -364,7 +364,7 @@ ca:
       assemblies:
         create_assembly_member:
           email_intro: Una administradora de l'assemblea <a href="%{resource_url}">%{resource_name}</a> t'ha afegit com a un dels seus membres.
-          email_outro: Reps aquesta notificació perquè t'han convidat a una assemblea. Entra en <a href="%{resource_url}">assembly page</a> per a contribuir-hi!
+          email_outro: Reps aquesta notificació perquè t'han convidat a una assemblea. Entra en <a href="%{resource_url}">pàgina de l'assemblea</a> per a contribuir-hi!
           email_subject: T'han convidat a ser membre de l'assemblea %{resource_name}!
           notification_title: T'han registrat com a membre de l'assemblea <a href="%{resource_path}">%{resource_name}</a>. Entra a <a href="%{resource_path}">la pàgina de l'assemblea</a> per a contribuir-hi!
       assembly: