decidim-proposals 0.29.1 → 0.29.3

data/config/locales/zh-CN.yml

@@ -190,12 +190,10 @@ zh-CN:
           email_subject: 新提议 "%{resource_title}" 已添加到 %{participatory_space_title}
         proposal_update_category:
           email_intro: '管理员更新了您的提议 "%{resource_title}"的类别，在此页面查看：'
-          email_outro: 您收到此通知是因为您是提案的作者。
           email_subject: '%{resource_title} 建议类别已更新'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议类别已被管理员更新。
         proposal_update_scope:
           email_intro: '管理员更新了您的提议 "%{resource_title}"的范围，在此页面查看：'
-          email_outro: 您收到此通知是因为您是提案的作者。
           email_subject: '%{resource_title} 建议范围已更新'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议范围已被管理员更新。
         voting_enabled:
@@ -240,9 +238,11 @@ zh-CN:
         description: 建议数
         object: 提议
         title: 建议
+      votes:
+        title: 所得票数
     participatory_spaces:
       highlighted_proposals:
-        see_all: 查看所有建议 (%{count})
+        see_all: 查看所有建议
     proposals:
       actions:
         answer_proposal: 答复建议
@@ -309,7 +309,6 @@ zh-CN:
           index:
             actions: 行动
             assign_to_valuator: 分配给值器
-            assign_to_valuator_button: 分配
             cancel: 取消
             change_category: 更改类别
             change_scope: 更改范围
@@ -323,7 +322,6 @@ zh-CN:
             split_button: 拆分
             title: 建议
             unassign_from_valuator: 取消分配给值
-            unassign_from_valuator_button: 取消分配
             update: 更新
             update_scope_button: 更新范围
           new:

data/config/locales/zh-TW.yml

@@ -87,7 +87,7 @@ zh-TW:
       filters:
         proposals:
           category_id_eq:
-            label: 分類
+            label: 類別
           is_emendation_true:
             label: 類別
             values:
@@ -254,12 +254,10 @@ zh-TW:
           notification_title_official: 官方提案 <a href="%{resource_path}">%{resource_title}</a> 已經被添加到 %{participatory_space_title}.
         proposal_update_category:
           email_intro: '管理員已更新您的提案 "%{resource_title}" 的分類，請前往此頁面查看：'
-          email_outro: 您收到此通知是因為您是該提案的作者。
           email_subject: '「%{resource_title}」提案的分類已更新'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案類別已由管理員更新。
         proposal_update_scope:
           email_intro: '一位管理員已更新您的提案"%{resource_title}" 的範圍，您可以在此頁面檢查：'
-          email_outro: 您收到此通知是因為您是該提案的作者。
           email_subject: '%{resource_title} 提案範圍已更新'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案範圍已由管理員更新。
         voting_enabled:
@@ -305,9 +303,11 @@ zh-TW:
         description: 提案總數
         object: 提案
         title: 提案
+      votes:
+        title: 投票
     participatory_spaces:
       highlighted_proposals:
-        see_all: 檢視所有提案 (%{count})
+        see_all: 檢視所有提案
     proposals:
       actions:
         answer_proposal: 回覆提案
@@ -417,7 +417,6 @@ zh-TW:
           index:
             actions: 操作
             assign_to_valuator: 分配給評估人員
-            assign_to_valuator_button: 指派
             cancel: 取消
             change_category: 變更類別
             change_scope: 變更範圍
@@ -431,7 +430,6 @@ zh-TW:
             split_button: 拆分
             title: 提案
             unassign_from_valuator: 取消分派給評估者
-            unassign_from_valuator_button: 取消分配
             update: 更新
             update_scope_button: 更新範圍
           new:
@@ -468,7 +466,6 @@ zh-TW:
         proposals_imports:
           create:
             invalid: 匯入提案時發生問題.
-            success: "%{number} 個提案成功匯入."
           new:
             create: 匯入提案
             no_components: 這個參與空間中沒有其他的提案元件可以匯入提案。
@@ -627,7 +624,7 @@ zh-TW:
       models:
         proposal:
           fields:
-            category: 分類
+            category: 類別
             comments: 評論
             id: ID
             notes: 備註
@@ -686,7 +683,6 @@ zh-TW:
           text_banner: 您正在查看由其作者撤回的提案列表。%{go_back_link}。
         new:
           send: 繼續
-          title: 創建你的提案
         orders:
           label: '依順序排序提案：'
           most_commented: 最多評論

data/db/migrate/20240110203504_create_default_proposal_states.rb

@@ -18,12 +18,13 @@ class CreateDefaultProposalStates < ActiveRecord::Migration[6.1]
     Decidim::Proposals::ProposalState.reset_column_information
     Decidim::Component.where(manifest_name: "proposals").find_each do |component|
       admin_user = component.organization.admins.first
-      Decidim::Proposals.create_default_states!(component, admin_user)
+      default_states = Decidim::Proposals.create_default_states!(component, admin_user)
 
       CustomProposal.where(decidim_component_id: component.id).find_each do |proposal|
         next if proposal.old_state == "not_answered"
 
-        proposal.update!(proposal_state: Decidim::Proposals::ProposalState.where(component:, token: proposal.old_state).first!)
+        token = default_states[proposal.old_state.to_sym][:object]&.token
+        proposal.update!(proposal_state: Decidim::Proposals::ProposalState.where(component:, token:).first!)
       end
     end
   end

data/decidim-proposals.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Proposals.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",

data/lib/decidim/api/proposal_type.rb

@@ -55,6 +55,19 @@ module Decidim
         current_component = object.component
         object.proposal_votes_count unless current_component.current_settings.votes_hidden?
       end
+
+      def self.authorized?(object, context)
+        context[:proposal] = object
+
+        chain = [
+          allowed_to?(:read, :proposal, object, context),
+          object.published?
+        ].all?
+
+        super && chain
+      rescue Decidim::PermissionAction::PermissionNotSetError
+        false
+      end
     end
   end
 end

data/lib/decidim/api/proposals_type.rb

@@ -16,9 +16,7 @@ module Decidim
       end
     end
 
-    class ProposalsType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class ProposalsType < Decidim::Core::ComponentType
       graphql_name "Proposals"
       description "A proposals component of a participatory space."
 

data/lib/decidim/proposals/proposal_serializer.rb

@@ -44,7 +44,8 @@ module Decidim
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
           answered_at: proposal.answered_at,
-          votes: proposal.proposal_votes_count,
+          votes: (proposal.proposal_votes_count unless
+          proposal.component.current_settings.votes_hidden?),
           endorsements: {
             total_count: proposal.endorsements.size,
             user_endorsements:
@@ -132,7 +133,7 @@ module Decidim
 
       def author_url(author)
         if author.respond_to?(:nickname)
-          profile_url(author.nickname) # is a Decidim::User or Decidim::UserGroup
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
         elsif author.respond_to?(:title)
           meeting_url(author) # is a Decidim::Meetings::Meeting
         else
@@ -140,8 +141,10 @@ module Decidim
         end
       end
 
-      def profile_url(nickname)
-        Decidim::Core::Engine.routes.url_helpers.profile_url(nickname, host:)
+      def profile_url(author)
+        return "" if author.respond_to?(:deleted?) && author.deleted?
+
+        Decidim::Core::Engine.routes.url_helpers.profile_url(author.nickname, host:)
       end
 
       def meeting_url(meeting)

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

@@ -356,7 +356,7 @@ FactoryBot.define do
     trait :participant_author do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        user = build(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
+        user = build(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
         proposal.coauthorships.build(author: user)
       end
     end
@@ -380,8 +380,8 @@ FactoryBot.define do
     trait :official_meeting do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        component = build(:meeting_component, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
-        proposal.coauthorships.build(author: build(:meeting, component:, skip_injection: evaluator.skip_injection))
+        component = build(:meeting_component, :published, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
+        proposal.coauthorships.build(author: build(:meeting, :published, component:, skip_injection: evaluator.skip_injection))
       end
     end
 
@@ -444,7 +444,8 @@ FactoryBot.define do
     trait :with_endorsements do
       after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
+          create(:endorsement, resource: proposal,
+                               author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
                                skip_injection: evaluator.skip_injection)
         end
       end
@@ -489,7 +490,7 @@ FactoryBot.define do
     end
     amendable { build(:proposal, skip_injection:) }
     emendation { build(:proposal, component: amendable.component, skip_injection:) }
-    amender { build(:user, organization: amendable.component.participatory_space.organization, skip_injection:) }
+    amender { build(:user, :confirmed, organization: amendable.component.participatory_space.organization, skip_injection:) }
     state { Decidim::Amendment::STATES.keys.sample }
   end
 

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.29.1"
+      "0.29.3"
     end
   end
 end

data/lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake

@@ -15,6 +15,28 @@ namespace :decidim_proposals do
       end
     end
 
+    desc "Fix proposal states created by import from other component bug"
+    task fix_state: :environment do
+      states_ids_for_reset = []
+      Decidim::Proposals::Proposal.unscoped.includes(:proposal_state).where.not(decidim_proposals_proposal_state_id: nil).find_each(batch_size: 100) do |proposal|
+        next if proposal.decidim_component_id == proposal.proposal_state.decidim_component_id
+
+        states_ids_for_reset.push(proposal.proposal_state.id)
+        new_state = Decidim::Proposals::ProposalState.where(component: proposal.component, token: proposal.proposal_state.token).first
+        if new_state.present?
+          states_ids_for_reset.push(new_state.id)
+          proposal.update_columns(decidim_proposals_proposal_state_id: new_state.id) # rubocop:disable Rails/SkipsModelValidations
+        else
+          # if the state is not found on the proposal component, the state is custom and should be removed
+          proposal.update_columns(decidim_proposals_proposal_state_id: nil) # rubocop:disable Rails/SkipsModelValidations
+        end
+      end
+      states_ids_for_reset.uniq.each do |state_id|
+        Decidim::Proposals::ProposalState.reset_counters(state_id, :proposals)
+      end
+      puts "FINISHED"
+    end
+
     desc "Removes all proposal valuator records of which the role assignment does not exists"
     task remove_valuator_orphan_records: :environment do
       if Decidim.module_installed?("participatory_processes")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.29.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.3
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -322,9 +322,11 @@ files:
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
 - app/helpers/decidim/proposals/proposal_wizard_helper.rb
 - app/helpers/decidim/proposals/proposals_helper.rb
+- app/jobs/decidim/proposals/admin/import_proposals_job.rb
 - app/jobs/decidim/proposals/hide_all_created_by_author_job.rb
 - app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb
 - app/jobs/decidim/proposals/settings_change_job.rb
+- app/mailers/decidim/proposals/admin/import_proposals_mailer.rb
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/collaborative_draft.rb
 - app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
@@ -371,10 +373,13 @@ files:
 - app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb
 - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
 - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
+- app/services/decidim/proposals/collaborative_draft_diff_renderer.rb
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
 - app/validators/proposal_length_validator.rb
+- app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb
+- app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb
 - app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
@@ -454,6 +459,9 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - 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
@@ -626,7 +634,7 @@ files:
 - lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/