decidim-core 0.30.0.rc3 → 0.30.1

data/lib/decidim/participatory_space_user.rb

@@ -37,9 +37,7 @@ module Decidim
         raise "Not implemented"
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        return [] unless auth_object&.admin?
-
+      def self.ransackable_attributes(_auth_object = nil)
         %w(name nickname email invitation_accepted_at last_sign_in_at role)
       end
 

data/lib/decidim/private_download_helper.rb

@@ -2,10 +2,10 @@
 
 module Decidim
   module PrivateDownloadHelper
-    def attach_archive(export_data, name, user)
+    def attach_archive(export_data, file_name, user, export_type = nil)
       private_exports = user.private_exports.build
-      private_exports.export_type = name
-      private_exports.file.attach(io: StringIO.open(FileZipper.new(export_data.filename(name), export_data.read).zip), filename: "#{name}.zip")
+      private_exports.export_type = export_type || file_name
+      private_exports.file.attach(io: StringIO.open(FileZipper.new(export_data.filename(file_name), export_data.read).zip), filename: "#{file_name}.zip")
       private_exports.expires_at = Decidim.download_your_data_expiry_time.from_now
       private_exports.metadata = {}
       private_exports.save!

data/lib/decidim/reportable.rb

@@ -53,8 +53,12 @@ module Decidim
       # Public: The reported content url
       #
       # Returns String
-      def reported_content_url
-        raise NotImplementedError
+      def reported_content_url(options = {})
+        if hidden?
+          ResourceLocatorPresenter.new(self).index(options)
+        else
+          ResourceLocatorPresenter.new(self).url(options)
+        end
       end
 
       # Public: The collection of attribute names that are considered

data/lib/decidim/translatable_attributes.rb

@@ -62,7 +62,7 @@ module Decidim
             final = super(value)
             return unless final # Do not set the `nil` values for the parent hash
 
-            final = value_type.serialize(final) if value_type
+            final = value_type.serialize(final) if value_type && !attachment?(final)
 
             public_send("#{name}=", field.merge(locale => final))
           end
@@ -127,5 +127,9 @@ module Decidim
       locale.to_s == try(:default_locale).to_s ||
         locale.to_s == try(:current_organization).try(:default_locale).to_s
     end
+
+    def attachment?(value)
+      value.is_a?(String) && value.include?(ActiveStorage.routes_prefix)
+    end
   end
 end

data/lib/tasks/upgrade/clean.rake

@@ -11,7 +11,8 @@ namespace :decidim do
         :"decidim:upgrade:clean:categories",
         :"decidim:upgrade:clean:action_logs",
         :"decidim:upgrade:clean:clean_deleted_users",
-        :"decidim:upgrade:clean:fix_blocked_user_notification"
+        :"decidim:upgrade:clean:fix_blocked_user_notification",
+        :"decidim:upgrade:clean:invalid_private_exports"
       ]
 
       desc "Remove data from deleted users"
@@ -140,6 +141,13 @@ namespace :decidim do
         logger.info("===== Updated #{blocked_users} blocked users")
       end
 
+      desc "Removes all the invalid records from private downloads"
+      task invalid_private_exports: :environment do
+        invalid_private_exports = Decidim::PrivateExport.where("export_type ~ '^survey_user_answers_[0-9a-f]{64}$'")
+        logger.info("=== Removing #{invalid_private_exports.length} private exports")
+        invalid_private_exports.delete_all
+      end
+
       def logger
         @logger ||= Logger.new($stdout)
       end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -7,7 +7,7 @@ namespace :decidim do
       logger.info("Fixing user nicknames case...")
 
       has_changed = []
-      Decidim::User.not_deleted.find_each do |user|
+      Decidim::UserBaseEntity.not_deleted.find_each do |user|
         user.nickname.downcase!
 
         begin
@@ -15,11 +15,11 @@ namespace :decidim do
             user.save!
             has_changed << user.id
           end
-        rescue ActiveRecord::RecordInvalid
-          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, user.decidim_organization_id))
           has_changed << user.id
         rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
-          logger.warn("User ID (#{similar_user.id}) : #{e}")
+          logger.warn("User ID (#{user.id}) : #{e}")
         end
       end
       logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")

data/lib/tasks/upgrade/migrations.rake

@@ -75,7 +75,9 @@ namespace :decidim do
       end
 
       new_source = "#{magic_comments}#{inserted_comment}#{source}"
+
       old_source = File.binread(target_file)
+      old_source = old_source.gsub(/# This file has been modified by `decidim upgrade:migrations` task on (.*)\n/, "")
 
       return if old_source == new_source
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc3
+  version: 0.30.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -780,28 +780,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc3
+        version: 0.30.1
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -2080,7 +2080,8 @@ files:
 - app/views/decidim/pages/show.html.erb
 - app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb
 - app/views/decidim/profiles/show.html.erb
-- app/views/decidim/reported_mailer/hide.html.erb
+- app/views/decidim/reported_mailer/hidden_automatically.html.erb
+- app/views/decidim/reported_mailer/hidden_manually.html.erb
 - app/views/decidim/reported_mailer/report.html.erb
 - app/views/decidim/searches/_count.html.erb
 - app/views/decidim/searches/_filters.html.erb
@@ -2199,6 +2200,7 @@ files:
 - config/locales/bg.yml
 - config/locales/bn-BD.yml
 - config/locales/bs-BA.yml
+- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -3079,7 +3081,6 @@ files:
 - lib/tasks/decidim_taxonomies.rake
 - lib/tasks/decidim_webpacker_tasks.rake
 - lib/tasks/upgrade/clean.rake
-- lib/tasks/upgrade/clean_hidden_resources.rake
 - lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake
 - lib/tasks/upgrade/decidim_attachments.rake
 - lib/tasks/upgrade/decidim_content_blocks_tasks.rake

data/app/views/decidim/reported_mailer/hide.html.erb

@@ -1,9 +0,0 @@
-<p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
-
-<p class="email-instructions">
-  <%= t(".report_html", url: reported_content_url ) %>
-</p>
-
-<p class="email-button email-button__cta">
-  <%= link_to t(".manage_moderations"), manage_moderations_url %>
-</p>

data/lib/tasks/upgrade/clean_hidden_resources.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :decidim do
-  namespace :upgrade do
-    namespace :clean do
-      desc "Removes all related resources from hidden resource"
-      task hidden_resources: :environment do
-        logger.info("Removing child resources for hidden parents...")
-        Decidim::Moderation.hidden.find_each do |moderation_for_hidden_resource|
-          reportable = moderation_for_hidden_resource.reportable
-
-          current_user = if Decidim.module_installed?(:ai)
-                           reportable.organization.users.find_by!(email: Decidim::Ai::SpamDetection.reporting_user_email)
-                         else
-                           reportable.organization.admins.first
-                         end
-
-          tool = Decidim::ModerationTools.new(reportable, current_user)
-          tool.hide!
-        rescue NameError => e
-          log_error "Could not hide child resources for reportable id #{moderation_for_hidden_resource.id} because: #{e.message}"
-        end
-      end
-
-      private
-
-      def log_error(msg)
-        puts msg
-        Rails.logger.error(msg)
-      end
-    end
-  end
-end