decidim-core 0.27.4 → 0.27.5

data/config/locales/zh-CN.yml

@@ -386,7 +386,6 @@ zh-CN:
           already_have_an_account?: 已经有一个帐户？
           newsletter: 接收附带相关信息的时事通讯
           newsletter_title: 联系人权限
-          sign_in: 登录
           sign_up: 注册
           sign_up_as:
             legend: 注册为
@@ -432,7 +431,6 @@ zh-CN:
         download_data: 下载数据
         request_data: 请求数据
     endorsable:
-      endorsements: 授权
       endorsements_count: 批准次数
     endorsement_buttons_cell:
       already_endorsed: 已批准
@@ -635,6 +633,10 @@ zh-CN:
       file_validation:
         allowed_file_extensions: '允许的文件扩展名: %{extensions}'
         max_file_size: '最大文件大小: %{megabytes}MB'
+      upload:
+        labels:
+          cancel: 取消
+          save: 保存
     gamification:
       all_badges_link: 查看所有可用的徽章。
       badges:
@@ -959,7 +961,6 @@ zh-CN:
           proposals: 建议
           proposals_explanation: 提出建议、支持现有建议并促进你想要看到的更改。
         footer_sub_hero:
-          footer_sub_hero_body: 让我们建设一个更加开放、透明和协作的社会。<br /> 加入、参与和决定。
           footer_sub_hero_headline: 欢迎使用 %{organization} 参与式平台。
           register: 注册
         hero:
@@ -1334,8 +1335,6 @@ zh-CN:
       updated: 您的帐户已成功更新。
     sessions:
       already_signed_out: 已成功注销。
-      new:
-        sign_in: 登录
       signed_in: 登录成功。
       signed_out: 已成功注销。
     shared:
@@ -1344,7 +1343,6 @@ zh-CN:
         didn_t_receive_confirmation_instructions: 没有收到确认说明？
         didn_t_receive_unlock_instructions: 没有收到解锁指令？
         forgot_your_password: 忘记密码？
-        sign_in: 登录
         sign_in_with_provider: 使用 %{provider} 登录
         sign_up: 注册
       minimum_password_length:
@@ -1414,8 +1412,9 @@ zh-CN:
         facebook: "%{organization} 在 Facebook"
         github: "%{organization} 在 GitHub"
         instagram: "%{organization} 在 Instagram"
-        twitter: "%{organization} 在 Twitter"
         youtube: "%{organization} 在 YouTube"
+      upload_modal:
+        close_modal: 关闭模式
       user_menu:
         account: '用户帐户: %{name}'
         admin_dashboard: 管理员控制面板

data/config/locales/zh-TW.yml

@@ -519,7 +519,6 @@ zh-TW:
           newsletter: 偶爾收到包含相關信息的時事通訊。
           newsletter_title: 聯絡人權限
           nickname_help: 在 %{organization} 中的別名。只能包含字母、數字、'-' 和 '_'。
-          sign_in: 登入
           sign_up: 註冊登記
           sign_up_as:
             legend: 註冊登記為
@@ -1208,7 +1207,6 @@ zh-TW:
           proposals: 提案
           proposals_explanation: 提出建議、支持現有建議並推動您希望看到的變化。
         footer_sub_hero:
-          footer_sub_hero_body: 一起建立更加開放、透明和協作的社會。<br /> 加入、參與和做出決策。
           footer_sub_hero_headline: 歡迎來到 %{organization} 的參與平台。
           register: 註冊
         hero:
@@ -1638,8 +1636,6 @@ zh-TW:
       updated: 您的帳號已成功升級。
     sessions:
       already_signed_out: 已成功登出。
-      new:
-        sign_in: 登入
       signed_in: 已成功登入。
       signed_out: 已成功登出。
     shared:
@@ -1648,7 +1644,6 @@ zh-TW:
         didn_t_receive_confirmation_instructions: 沒有收到確認的說明嗎？
         didn_t_receive_unlock_instructions: 沒有收到解鎖說明？
         forgot_your_password: 忘記密碼了嗎？
-        sign_in: 登入
         sign_in_with_provider: 用%{provider} 登錄
         sign_up: 註冊登記
       minimum_password_length:
@@ -1773,7 +1768,6 @@ zh-TW:
         facebook: "%{organization} 在 Facebook"
         github: "%{organization} 在 GitHub"
         instagram: "%{organization} 在 Instagram"
-        twitter: "%{organization} 在 Twitter"
         youtube: "%{organization} 在 YouTube"
       timeout_modal:
         body: 您已經閒置了 %{minutes} 分鐘。如果您繼續閒置，為了您的安全，您將被自動登出。

data/db/migrate/20231027142329_change_default_value_for_decidim_endorsements.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ChangeDefaultValueForDecidimEndorsements < ActiveRecord::Migration[6.1]
+  def up
+    change_column_default :decidim_endorsements, :decidim_user_group_id, 0
+  end
+
+  def down
+    change_column_default :decidim_endorsements, :decidim_user_group_id, nil
+  end
+end

data/db/seeds.rb

@@ -37,6 +37,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
       port: ENV.fetch("SMTP_PORT", nil) || ENV.fetch("DECIDIM_SMTP_PORT", "25")
     },
     host: ENV.fetch("DECIDIM_HOST", "localhost"),
+    secondary_hosts: ENV.fetch("DECIDIM_HOST", "localhost") == "localhost" ? ["0.0.0.0", "127.0.0.1"] : nil,
     external_domain_whitelist: ["decidim.org", "github.com"],
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
       Decidim::Faker::Localized.sentence(word_count: 15)

data/lib/decidim/core/test/factories.rb

@@ -364,7 +364,8 @@ FactoryBot.define do
     published_at { Time.current }
     settings do
       {
-        dummy_global_translatable_text: generate_localized_title
+        dummy_global_translatable_text: generate_localized_title,
+        comments_max_length: participatory_space.organization.comments_max_length || organization.comments_max_length
       }
     end
 

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -838,5 +838,29 @@ shared_examples "comments" do
         expect(page).to have_link "#decidim", href: "/search?term=%23decidim"
       end
     end
+
+    describe "export_serializer" do
+      let(:comment) { comments.first }
+
+      it "returns the serializer for the comment" do
+        expect(comment.class.export_serializer).to eq(Decidim::Comments::CommentSerializer)
+      end
+
+      context "with instance" do
+        subject { comment.class.export_serializer.new(comment).serialize }
+
+        it { is_expected.to have_key(:id) }
+        it { is_expected.to have_key(:created_at) }
+        it { is_expected.to have_key(:body) }
+        it { is_expected.to have_key(:locale) }
+        it { is_expected.to have_key(:author) }
+        it { is_expected.to have_key(:alignment) }
+        it { is_expected.to have_key(:depth) }
+        it { is_expected.to have_key(:user_group) }
+        it { is_expected.to have_key(:commentable_id) }
+        it { is_expected.to have_key(:commentable_type) }
+        it { is_expected.to have_key(:root_commentable_url) }
+      end
+    end
   end
 end

data/lib/decidim/core/test/shared_examples/errors.rb

@@ -18,6 +18,8 @@ shared_examples_for "a 404 page" do
       expect(page).to have_content("The page you're looking for can't be found")
 
       expect(page).to have_http_status(:not_found)
+
+      expect(page).to have_current_path(target_path)
     end
   end
 end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.27.4"
+      "0.27.5"
     end
   end
 end

data/lib/decidim/core.rb

@@ -585,7 +585,7 @@ module Decidim
   #
   # Returns an Array[ComponentManifest].
   def self.component_manifests
-    component_registry.manifests
+    component_registry.manifests.sort_by(&:name)
   end
 
   # Public: Finds all registered participatory space manifest's via the

data/lib/decidim/endorsable.rb

@@ -21,7 +21,7 @@ module Decidim
         if user_group
           endorsements.where(user_group: user_group).any?
         else
-          endorsements.where(author: user, user_group: nil).any?
+          endorsements.where(author: user, user_group: 0).any?
         end
       end
     end

data/lib/decidim/exporters.rb

@@ -9,6 +9,11 @@ module Decidim
     autoload :PDF, "decidim/exporters/pdf"
     autoload :ExportData, "decidim/exporters/export_data"
 
+    # Lock the export formats to one of the available exporters
+    EXPORT_FORMATS = [:JSON, :CSV, :Excel, :PDF, :FormPDF].freeze
+
+    class UnknownFormatError < StandardError; end
+
     # Necessary for the i18n normalizer to locate strings not directly invoked in views:
 
     # i18n-tasks-use t('decidim.admin.exports.formats.JSON')
@@ -19,7 +24,11 @@ module Decidim
     #
     # format - The exporter format as a string. i.e "CSV"
     def self.find_exporter(format)
-      const_get(format)
+      raise UnknownFormatError unless format.respond_to?(:to_sym)
+      raise UnknownFormatError unless EXPORT_FORMATS.include?(format.to_sym)
+      raise UnknownFormatError unless const_defined?(format.to_sym)
+
+      const_get(format.to_sym)
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -317,6 +317,7 @@ module Decidim
       template = ""
       template += "<label>#{label_for(attribute) + required_for_attribute(attribute)}</label>" unless options[:label] == false
       template += @template.render("decidim/scopes/scopes_picker_input",
+                                   values_options: { delete_button: true, class: "label primary" },
                                    picker_options: picker_options,
                                    prompt_params: prompt_params,
                                    scopes: scopes,

data/lib/decidim/has_category.rb

@@ -26,11 +26,11 @@ module Decidim
         cat_ids = parent_ids.dup
         cat_ids.prepend(nil) if categories.include?("without")
 
-        subquery = includes(:category).where(decidim_categories: { id: cat_ids })
+        subquery = left_outer_joins(:category).where(decidim_categories: { id: cat_ids })
         return subquery if parent_ids.none?
 
         subquery.or(
-          includes(:category).where(decidim_categories: { parent_id: parent_ids })
+          left_outer_joins(:category).where(decidim_categories: { parent_id: parent_ids })
         )
       }
 

data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Remove duplicated endorsements"
+    task fix_duplicate_endorsements: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Removing duplicate endorsements...")
+      has_count = 0
+
+      columns = [:resource_type, :resource_id, :decidim_author_type, :decidim_author_id, :decidim_user_group_id]
+
+      get_duplicates(columns).each do |issue|
+        while row_count(issue) > 1
+          find_next(issue)&.destroy
+          has_count += 1
+          logger.info("Removed duplicate endorsement for #{issue.resource_type} #{issue.resource_id}")
+        end
+      end
+
+      logger.info("Patch remaining endorsements.")
+      Decidim::Endorsement.where(decidim_user_group_id: nil).update(decidim_user_group_id: 0)
+      logger.info("Process terminated, #{has_count} endorsements have been removed.")
+      logger.info("Done")
+    end
+
+    private
+
+    def get_duplicates(*columns)
+      Decidim::Endorsement.select("#{columns.join(",")}, COUNT(*)").group(columns).having("COUNT(*) > 1")
+    end
+
+    def row_count(issue)
+      Decidim::Endorsement.where(
+        resource_type: issue.resource_type,
+        resource_id: issue.resource_id,
+        decidim_author_type: issue.decidim_author_type,
+        decidim_author_id: issue.decidim_author_id,
+        decidim_user_group_id: issue.decidim_user_group_id
+      ).count
+    end
+
+    def find_next(issue)
+      Decidim::Endorsement.find_by(
+        resource_type: issue.resource_type,
+        resource_id: issue.resource_id,
+        decidim_author_type: issue.decidim_author_type,
+        decidim_author_id: issue.decidim_author_id,
+        decidim_user_group_id: issue.decidim_user_group_id
+      )
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_fix_short_url_resolver.rake

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Fix wrongly mapped short links components"
+    task fix_short_urls: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Fixing wrongly mapped short links...")
+
+      Decidim::ShortLink.where(target_type: "Decidim::Component").find_each do |short_url|
+        real_component = Decidim::Component.find_by(id: short_url.target_id)
+
+        next if real_component.nil?
+        next if short_url.mounted_engine_name == real_component.mounted_engine
+
+        logger.info("Fixing #{short_url.identifier}: #{short_url.mounted_engine_name} to #{real_component.mounted_engine}")
+        short_url.update(mounted_engine_name: real_component.mounted_engine)
+      end
+      logger.info("Done fixing wrongly mapped short links.")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -740,28 +740,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.27.5
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1201,7 +1201,6 @@ files:
 - app/helpers/decidim/icon_helper.rb
 - app/helpers/decidim/language_chooser_helper.rb
 - app/helpers/decidim/layout_helper.rb
-- app/helpers/decidim/layout_helper.rb.orig
 - app/helpers/decidim/localized_locales_helper.rb
 - app/helpers/decidim/map_helper.rb
 - app/helpers/decidim/markup_helper.rb
@@ -1396,6 +1395,7 @@ files:
 - app/packs/images/decidim/vendor/social-share-button/wechat.svg
 - app/packs/images/decidim/vendor/social-share-button/weibo.svg
 - app/packs/images/decidim/vendor/social-share-button/whatsapp.svg
+- app/packs/images/decidim/vendor/social-share-button/x.svg
 - app/packs/images/decidim/vendor/social-share-button/xing.svg
 - app/packs/src/decidim/account_form.js
 - app/packs/src/decidim/ajax_modals.js
@@ -1495,6 +1495,7 @@ files:
 - app/packs/src/decidim/sw/sw.js
 - app/packs/src/decidim/tooltip_keep_on_hover.js
 - app/packs/src/decidim/user_registrations.js
+- app/packs/src/decidim/utilities/text.js
 - app/packs/src/decidim/vendor/foundation-datepicker.js
 - app/packs/src/decidim/vendor/image-resize.min.js
 - app/packs/src/decidim/vendor/image-upload.min.js
@@ -1564,7 +1565,6 @@ files:
 - app/packs/stylesheets/decidim/modules/_datepicker.scss
 - app/packs/stylesheets/decidim/modules/_definition-data.scss
 - app/packs/stylesheets/decidim/modules/_docs-manager.scss
-- app/packs/stylesheets/decidim/modules/_dropdown_menu.scss
 - app/packs/stylesheets/decidim/modules/_extra.scss
 - app/packs/stylesheets/decidim/modules/_filter-tags.scss
 - app/packs/stylesheets/decidim/modules/_filters.scss
@@ -1828,7 +1828,6 @@ files:
 - app/views/decidim/devise/passwords/edit.html.erb
 - app/views/decidim/devise/passwords/new.html.erb
 - app/views/decidim/devise/registrations/new.html.erb
-- app/views/decidim/devise/registrations/new.html.erb.orig
 - app/views/decidim/devise/sessions/new.html.erb
 - app/views/decidim/devise/shared/_links.html.erb
 - app/views/decidim/devise/shared/_newsletter_modal.html.erb
@@ -2076,9 +2075,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -2296,6 +2297,7 @@ files:
 - db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb
 - db/migrate/20220518094535_add_previous_passwords_to_users.rb
 - db/migrate/20220524195530_create_decidim_short_links.rb
+- db/migrate/20231027142329_change_default_value_for_decidim_endorsements.rb
 - db/seeds.rb
 - db/seeds/homepage_image.jpg
 - lib/decidim/action_authorization.rb
@@ -2688,7 +2690,9 @@ files:
 - lib/tasks/decidim_reminders_tasks.rake
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
+- lib/tasks/upgrade/decidim_deduplicate_endorsements.rake
 - lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake
+- lib/tasks/upgrade/decidim_fix_short_url_resolver.rake
 - lib/tasks/upgrade/decidim_moderation_tasks.rake
 - lib/tasks/upgrade/decidim_user_moderation.rake
 homepage: https://github.com/decidim/decidim
@@ -2710,7 +2714,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.