decidim-proposals 0.30.0.rc1 → 0.30.0.rc3

data/config/locales/sk.yml

@@ -276,7 +276,6 @@ sk:
           index:
             actions: Akcia
             assign_to_valuator: Priradiť ku hodnotiteľovi
-            assign_to_valuator_button: Priradiť
             cancel: zrušenie
             merge: Zlúčiť do nového
             merge_button: Spoj
@@ -288,7 +287,6 @@ sk:
             split_button: Rozdeliť
             title: Návrhy
             unassign_from_valuator: Zrušiť priradenie ku hodnotiteľovi
-            unassign_from_valuator_button: Zrušiť priradenie
             update: Aktualizácia
           new:
             create: Vytvoriť

data/config/locales/sr-CS.yml

@@ -35,6 +35,8 @@ sr:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: Dobili ste ovo obaveštenje jer možete da procenite predlog.
           proposal_note_created:
             email_outro: Dobili ste ovo obaveštenje jer možete da procenite predlog.
             email_subject: Neko je ostavio poruku na predlogu %{resource_title}.
@@ -48,10 +50,8 @@ sr:
         proposals:
           index:
             assign_to_valuator: Dodeli procenjivaču
-            assign_to_valuator_button: Dodeli
             publish_answers: Objavi odgovore
             unassign_from_valuator: Oduzmi od procenjivača
-            unassign_from_valuator_button: Od dodeli
           show:
             amendments_count: Broj izmena
             assigned_valuators: Dodeljeni procenjivači

data/config/locales/sv.yml

@@ -577,7 +577,6 @@ sv:
             actions: Åtgärder
             apply_answer_template: Tillämpa svarsmall
             assign_to_valuator: Tilldela till handläggare
-            assign_to_valuator_button: Tilldela
             cancel: Avbryt
             merge: Slå samman till ett nytt
             merge_button: Slå ihop
@@ -592,7 +591,6 @@ sv:
             statuses: Statusar
             title: Förslag
             unassign_from_valuator: Ta bort tilldelning till handläggare
-            unassign_from_valuator_button: Ta bort tilldelning
             update: Uppdatera
           new:
             create: Skapa
@@ -622,7 +620,6 @@ sv:
         proposals_imports:
           create:
             invalid: Det gick inte att importera förslagen.
-            success: "%{number} förslag har importerats."
           new:
             create: Importera förslag
             no_components: Det finns inga andra förslagskomponenter i detta deltagarutrymme att importera förslagen från.
@@ -785,7 +782,6 @@ sv:
           success: Inbjudan till medförfattare har avbrutits.
         create:
           error: Det gick inte att bjuda in medförfattaren.
-          success: "%{author_name} har bjudits in som medförfattare."
         destroy:
           error: Det gick inte att avböja inbjudan.
           success: Inbjudan har avvisats.

data/config/locales/tr-TR.yml

@@ -158,6 +158,8 @@ tr:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: Bu bildirimi, teklifi değerlendirebileceğiniz için aldınız.
           proposal_note_created:
             email_outro: Bu bildirimi, teklifi değerlendirebileceğiniz için aldınız.
             email_subject: Birisi %{resource_title} teklifine not bıraktı.
@@ -347,7 +349,6 @@ tr:
           index:
             actions: Eylemler
             assign_to_valuator: Bilirkişiye ata
-            assign_to_valuator_button: Ata
             cancel: İptal Et
             merge: Yeni biriyle birleştir
             merge_button: Birleştir
@@ -360,7 +361,6 @@ tr:
             statuses: Durumlar
             title: Teklifler
             unassign_from_valuator: Bilirkişinin atamasını kaldır
-            unassign_from_valuator_button: Atamayı kaldır
             update: Güncelle
           new:
             create: Oluştur

data/config/locales/zh-CN.yml

@@ -136,6 +136,8 @@ zh-CN:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: 您收到此通知是因为您可以评估提案。
           proposal_note_created:
             email_outro: 您收到此通知是因为您可以评估提案。
             email_subject: 有人在建议 %{resource_title} 留下了一条笔记。
@@ -283,7 +285,6 @@ zh-CN:
           index:
             actions: 行动
             assign_to_valuator: 分配给值器
-            assign_to_valuator_button: 分配
             cancel: 取消
             merge: 合并为一个新的
             merge_button: 合并
@@ -295,7 +296,6 @@ zh-CN:
             split_button: 拆分
             title: 建议
             unassign_from_valuator: 取消分配给值
-            unassign_from_valuator_button: 取消分配
             update: 更新
           new:
             create: 创建

data/config/locales/zh-TW.yml

@@ -178,6 +178,8 @@ zh-TW:
     events:
       proposals:
         admin:
+          proposal_assigned_to_valuator:
+            email_outro: 您收到此通知，因為您可以對提案進行評估。
           proposal_note_created:
             email_outro: 您收到此通知，因為您可以對提案進行評估。
             email_subject: 有人在提案 %{resource_title} 上留下了一則註記。
@@ -368,7 +370,6 @@ zh-TW:
           index:
             actions: 操作
             assign_to_valuator: 分配給評估人員
-            assign_to_valuator_button: 指派
             cancel: 取消
             merge: 合併為新提案
             merge_button: 合併
@@ -380,7 +381,6 @@ zh-TW:
             split_button: 拆分
             title: 提案
             unassign_from_valuator: 取消分派給評估者
-            unassign_from_valuator_button: 取消分配
             update: 更新
           new:
             create: 建立
@@ -406,7 +406,6 @@ zh-TW:
         proposals_imports:
           create:
             invalid: 匯入提案時發生問題.
-            success: "%{number} 個提案成功匯入."
           new:
             create: 匯入提案
             no_components: 這個參與空間中沒有其他的提案元件可以匯入提案。

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.30.0.rc1"
+      "0.30.0.rc3"
     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.30.0.rc1
+  version: 0.30.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-19 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.30.0.rc1
+        version: 0.30.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc3
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -338,10 +338,12 @@ 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/admin/proposal_answer_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
@@ -395,6 +397,8 @@ files:
 - 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