Running linters

AjuntamentdeBarcelona · Nov 21, 2023 · 04eceef · 04eceef
1 parent af2184f
commit 04eceef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -71,7 +71,7 @@ def copy
         private
 
         def collection
-          @collection ||= AssembliesWithUserRole.new(current_user).query.includes(:children)
+          @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
         def current_assembly

diff --git a/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb b/decidim-assemblies/app/permissions/decidim/assemblies/permissions.rb
@@ -309,7 +309,7 @@ def user_role
 
       def assembly_admin_allowed_assemblies
         @assembly_admin_allowed ||= begin
-          assemblies = AssembliesWithUserRole.for(user, :admin).where(id:[ assembly.id, assembly.parent_id])
+          assemblies = AssembliesWithUserRole.for(user, :admin).where(id: [assembly.id, assembly.parent_id])
           child_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.children.pluck(:id) }
 
           Decidim::Assembly.where(id: assemblies + child_assemblies)