decidim-proposals 0.29.0 → 0.29.2

data/config/locales/tr-TR.yml

@@ -98,7 +98,7 @@ tr:
           proposal_state_id_eq:
             label: Durum
           scope_id_eq:
-            label: Kapsam
+            label: kapsam
           state_eq:
             label: Durum
             values:
@@ -144,7 +144,7 @@ tr:
             proposal_wizard_step_1_help_text: Teklif sihirbazı "Oluştur" adımı yardım metni
             proposal_wizard_step_2_help_text: Teklif "Yayınlama"  sihirbazı  yardım metni
             resources_permissions_enabled: Her teklif için işlem izinleri ayarlanabilir
-            scope_id: Kapsam
+            scope_id: kapsam
             scopes_enabled: Kapsamlar etkinleştirildi
             threshold_per_proposal: Teklif başına eşik
           step:
@@ -227,12 +227,10 @@ tr:
             notification_title: Takip ettiğiniz bir teklifin durumu (%{state}) olarak değiştirimiştir.
         proposal_update_category:
           email_intro: 'Bir yönetici "%{resource_title}" teklifinizin kategorisini güncelledi, bu sayfada kontrol edin:'
-          email_outro: Bu bildirimi, teklifin yazarı olduğunuz için aldınız.
           email_subject: '%{resource_title} teklif kategorisi güncellendi'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif kategorisi bir yönetici tarafından güncellendi.
         proposal_update_scope:
           email_intro: 'Bir yönetici, "%{resource_title}" teklifinizin kapsamını güncelledi, bu sayfada göz atın:'
-          email_outro: Bu bildirimi, teklifin yazarı olduğunuz için aldınız.
           email_subject: '%{resource_title} teklif kapsamı güncellendi'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> teklif kapsamı bir yönetici tarafından güncellendi.
         voting_enabled:
@@ -279,7 +277,7 @@ tr:
         title: Teklifler
     participatory_spaces:
       highlighted_proposals:
-        see_all: Tüm teklifleri görün (%{count})
+        see_all: Tüm teklifleri görün
     proposals:
       actions:
         answer_proposal: Cevap önerisi
@@ -490,7 +488,7 @@ tr:
           open: Aç
           published: Yayınlandı
           related_to: İle ilgili
-          scope: Kapsam
+          scope: kapsam
           search: Arama
           state: Statü
           withdrawn: Geri çekildi
@@ -563,7 +561,7 @@ tr:
             official_proposal: Resmi teklif
             published_answer: Yayınlanan cevap
             published_at: Yayınlandı
-            scope: Kapsam
+            scope: kapsam
             state: Durum
             title: Başlık
             valuator: Bilirkişi

data/config/locales/uk.yml

@@ -52,7 +52,7 @@ uk:
     components:
       proposals:
         actions:
-          create: Додати
+          create: Внести
           endorse: Підтримати
           vote: Голосувати
           withdraw: Відкликати голос
@@ -102,11 +102,8 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{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_outro: Ви отримали це сповіщення, оскільки ви є автором цієї пропозиції.
         voting_enabled:
           email_intro: 'Ви можете голосувати щодо пропозицій у %{participatory_space_title}! Почніть брати участь зі сторінки:'
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
@@ -136,7 +133,6 @@ uk:
           title: Приватні примітки
         proposals:
           form:
-            attachment_legend: "(Необов'язково) Додати вкладений файл"
             select_a_category: Оберіть категорію
           index:
             actions: Дії
@@ -180,13 +176,11 @@ uk:
       models:
         proposal:
           fields:
-            category: Категорія
             comments: Коментарі
             id: Псевдонім
             notes: Примітки
             official_proposal: Службова пропозиція
             published_at: 'Оприлюднено:'
-            scope: Обсяг
             state: Стан
             title: Назва
             votes: Голоси
@@ -230,7 +224,6 @@ uk:
           title: Оприлюднити свою пропозицію
         show:
           answer: Відповісти
-          edit_proposal: Редагувати пропозицію
           proposal_accepted_reason: 'Ця пропозиція була прийнята, тому що:'
           proposal_in_evaluation_reason: Ця пропозиція розглядається
           proposal_rejected_reason: 'Ця пропозиція була відхилена, оскільки:'

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:
@@ -242,7 +240,7 @@ zh-CN:
         title: 建议
     participatory_spaces:
       highlighted_proposals:
-        see_all: 查看所有建议 (%{count})
+        see_all: 查看所有建议
     proposals:
       actions:
         answer_proposal: 答复建议

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:
@@ -307,7 +305,7 @@ zh-TW:
         title: 提案
     participatory_spaces:
       highlighted_proposals:
-        see_all: 檢視所有提案 (%{count})
+        see_all: 檢視所有提案
     proposals:
       actions:
         answer_proposal: 回覆提案
@@ -627,7 +625,7 @@ zh-TW:
       models:
         proposal:
           fields:
-            category: 分類
+            category: 類別
             comments: 評論
             id: ID
             notes: 備註

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.0"
+      "0.29.2"
     end
   end
 end

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

@@ -2,6 +2,19 @@
 
 namespace :decidim_proposals do
   namespace :upgrade do
+    desc "Assigns category to emendations based on amendable category"
+    task set_categories: :environment do
+      Decidim::Proposals::Proposal.includes(:category).find_each do |proposal|
+        next if proposal.category.blank?
+        next unless proposal.amendable?
+
+        proposal.emendations.each do |emendation|
+          emendation.category = proposal.category
+          emendation.save(validate: false)
+        end
+      end
+    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.0
+  version: 0.29.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2025-02-12 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.0
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -371,6 +371,7 @@ 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
@@ -454,6 +455,8 @@ 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.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -626,7 +629,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/