decidim-assemblies 0.31.7 → 0.31.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc2bc05070130c13318e3d1b79efe6d3f9fae92879c4b2a2df6d6ef3403c308
-  data.tar.gz: c257f029c0733e2189a10a68552a293589cb1535d304e919c0a698997ba9ebf8
+  metadata.gz: 834c37a80060af9ef0ae034c1b6d1c70a4be1d683d88ce0b7dfcdba71a0306c1
+  data.tar.gz: eec0950f3a0b1dc4df44248647ec0194c29fe5451f94ecdcba674dfb6539861c
 SHA512:
-  metadata.gz: b51f37e764f9997d6c1b08973e6ab881f9b6035d7e5d07078fe94fbb22d506749b776cd0754b5742fd2c9c68b40b7c456ae3cb32b88c6e48578897fabf05b516
-  data.tar.gz: a11efbfa7b70a9a9dfacde3b29c3721cdebf5ee3f4e58059ca91e0020111d1acdc8d8f9b57359f23ce328b4184ce951598af8c40428244d5b1e47323100927c2
+  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/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: