decidim-assemblies 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a228da39c3efd6cd576b5062dfb95ea17bbace2e647121bb18ca960f60ecabce
-  data.tar.gz: 9c220e956ed5eb9cf43852564822b68f6f10dd28760e578162b5541532c7afee
+  metadata.gz: 618f69ec9e3713cbf5bcbb384bd4a68aa4485168bd95c58f53e5744356ff052a
+  data.tar.gz: 3e574e040746b63a04e3b99b64066d0161bf6dfaaa22ab9515b05f5b9f79185f
 SHA512:
-  metadata.gz: c7995e87556f38fff4828da0446dbf28e7c0f3675af5ca33c2d416e25266bef028df21ffe734a464f566eeb3659a9f518c03a591ac60723c23a5ffa7a77f02d0
-  data.tar.gz: a6b2bab8fa4630fc4aa00c075a056a3e598a0c0ee5794ad26140e554037a8e0f3ae70d92b11b9358b669f9653664404f030bb1c351d40783f54afab8557e7b77
+  metadata.gz: 6343b8aa19a9511ce7cc9908b7182752d9d9a7d5cba58dd39abd02c4cb23a67a9faa5b7498386934096e983248435063ecf48c9e6d6ee2a4f377c9e1fadbf6a3
+  data.tar.gz: 4ee5a39ccc16d47d01ebe22a77d26c6678973315c2b5b9fb04bc6b7f3845248d5a2d64037f7145800c395cddbd6461d4d55a22a39d309f4542b82aa0710817c3

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

@@ -20,19 +20,21 @@ 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/members_csv_imports_controller.rb

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

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

@@ -4,11 +4,13 @@ module Decidim
   module Assemblies
     class MembersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
+      include Paginable
       include Decidim::ParticipatorySpace::HasMembersPage
 
       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/permissions/decidim/assemblies/permissions.rb

@@ -120,7 +120,7 @@ module Decidim
         return true unless assembly.restricted?
         return false unless user
 
-        user.admin? || assembly.users.include?(user)
+        user.admin? || assembly_user_role?(user, assembly, broad_check: true) || assembly.users.include?(user)
       end
 
       def public_list_members_action?

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

@@ -17,15 +17,15 @@ edit_link(
 
 <main role="main">
   <% if current_participatory_space.restricted? %>
-    <section class="participatory-space__block-reference alert">
+    <aside class="layout-container__reference text-sm alert" aria-label="<%= t("restricted", scope: "decidim.participatory_space.labels") %>">
       <%= t("restricted_space", scope: "decidim.participatory_spaces.show") %>
-    </section>
+    </aside>
   <% end %>
 
   <% if current_participatory_space.transparent? %>
-    <section class="participatory-space__block-reference alert">
+    <aside class="layout-container__reference text-sm alert" aria-label="<%= t("transparent", scope: "decidim.participatory_space.labels") %>">
       <%= t("transparent_space", scope: "decidim.participatory_spaces.show") %>
-    </section>
+    </aside>
   <% end %>
 
   <div class="participatory-space__container">
@@ -39,7 +39,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/members/index.html.erb

@@ -22,5 +22,7 @@ edit_link(
     <div class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
       <%= render(collection) %>
     </div>
+
+    <%= decidim_paginate @members %>
   </section>
 <% end %>

data/config/locales/ca.yml

@@ -367,7 +367,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:
@@ -396,7 +396,7 @@ ca:
           assembly_type: El tipus d'assemblea
           closing_date: La data de tancament de l'assemblea
           closing_date_reason: Perquè es va tancar l'assemblea
-          component_settings: Configuració dels components de l'assemblea
+          component_settings: La configuració dels components de l'assemblea
           composition: La composició de l'assemblea
           created_at: La data en què es va crear aquesta assemblea
           created_by: Qui va crear l'assemblea