Merge branch '0.31-backports' of github.com:openpoke/decidim into 0.31-backports

Author: microstudi

decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb

@@ -109,8 +109,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        unless attachments["attachment_collections"].blank?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end

decidim-participatory_processes/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -131,8 +131,8 @@ def import_folders_and_attachments(attachments)
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        unless attachments["attachment_collections"].blank?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end