decidim-proposals 0.26.7 → 0.26.8

data/config/locales/uk.yml

@@ -51,6 +51,12 @@ uk:
         many: Голосів
         other: Голосів
   decidim:
+    admin:
+      filters:
+        proposals:
+          state_null:
+            values:
+              'true': Без відповідей
     components:
       proposals:
         actions:
@@ -225,6 +231,9 @@ uk:
           official: Службове
         filter_state_values:
           not_answered: Без відповідей
+      content_blocks:
+        highlighted_proposals:
+          proposals: Пропозиції
       create:
         error: При спробі збереження цієї пропозиції сталися помилки.
         success: Пропозицію успішно створено. Збережено як чернетку.
@@ -232,6 +241,9 @@ uk:
         error: При спробі видалити чернетку цієї пропозиції сталися помилки.
         success: Чернетку пропозиції успішно видалено.
       models:
+        collaborative_draft:
+          fields:
+            comments: Коментарі
         proposal:
           fields:
             category: Категорія
@@ -246,6 +258,9 @@ uk:
             votes: Голоси
       new:
         limit_reached: Ви не можете вносити нові пропозиції, оскільки ви перевищили ліміт.
+      participatory_text_proposal:
+        buttons:
+          comments: Коментарі
       proposal_votes:
         create:
           error: При голосуванні щодо пропозиції сталися помилки.
@@ -274,11 +289,6 @@ uk:
           search: Шукати
           state: Стан
           voted: Проголосоване
-        filters_small_view:
-          close_modal: Закрити віконце
-          filter: Відібрати
-          filter_by: 'Відібрати за ознакою:'
-          unfold: Розгорнути
         index:
           new_proposal: Додати нову пропозицію
           see_all_withdrawn: Переглянути всі відкликані пропозиції
@@ -345,7 +355,6 @@ uk:
           vote_limit:
             description: Ви можете проголосувати до %{limit} пропозицій.
             left: Залишилось
-            votes: Голоси
         wizard_aside:
           back: Повернутись
           info: Ви вносите <strong>пропозицію</strong>.

data/config/locales/zh-CN.yml

@@ -610,6 +610,9 @@ zh-CN:
           info: 您正在创建一个 <strong>协作草案</strong>。
         wizard_header:
           title: 创建您的协作草稿
+      content_blocks:
+        highlighted_proposals:
+          proposals: 建议
       create:
         error: 保存建议时出现问题。
         success: 建议已成功创建为草稿。
@@ -715,8 +718,6 @@ zh-CN:
           recent: 最近的
           with_more_authors: 有更多作者
         participatory_texts:
-          index:
-            document_index: 文档索引
           view_index:
             see_index: 查看索引
         preview:

data/config/locales/zh-TW.yml

@@ -833,8 +833,6 @@ zh-TW:
           recent: 最近
           with_more_authors: 有更多作者
         participatory_texts:
-          index:
-            document_index: 文件索引
           view_index:
             see_index: 查看索引
         placeholder:
@@ -910,7 +908,7 @@ zh-TW:
           vote_limit:
             description: 您最多可以支持 %{limit} 個提案。
             left: 剩餘
-            votes: 支持
+            votes: 支援
         wizard_aside:
           back: 返回
           back_from_step_1: 返回提案

data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb

@@ -5,13 +5,20 @@ class FixUserGroupsIdsInProposalsEndorsements < ActiveRecord::Migration[5.2]
     self.table_name = :decidim_proposals_proposal_endorsements
   end
 
+  class UserGroup < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+
+    default_scope { where(type: "Decidim::UserGroup") }
+  end
+
   # rubocop:disable Rails/SkipsModelValidations
   def change
-    Decidim::UserGroup.find_each do |group|
+    UserGroup.find_each do |group|
       old_id = group.extended_data["old_user_group_id"]
       next unless old_id
 
-      Decidim::Proposals::ProposalEndorsement
+      ProposalEndorsement
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
     end

data/db/migrate/20200708091228_move_proposals_fields_to_i18n.rb

@@ -1,15 +1,38 @@
 # frozen_string_literal: true
 
 class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
+  class Proposal < ApplicationRecord
+    include Decidim::HasComponent
+
+    self.table_name = :decidim_proposals_proposals
+  end
+
+  class Coauthorship < ApplicationRecord
+    self.table_name = :decidim_coauthorships
+  end
+
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
   def up
     add_column :decidim_proposals_proposals, :new_title, :jsonb
     add_column :decidim_proposals_proposals, :new_body, :jsonb
 
-    reset_column_information
-
     PaperTrail.request(enabled: false) do
-      Decidim::Proposals::Proposal.find_each do |proposal|
-        author = proposal.coauthorships.first.author
+      Proposal.find_each do |proposal|
+        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
+        author =
+          if coauthorship.decidim_author_type == "Decidim::Organization"
+            Organization.find_by(id: coauthorship.decidim_author_id)
+          else
+            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
+          end
 
         locale = if author
                    author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
@@ -38,17 +61,13 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
-
-    reset_column_information
   end
 
   def down
     add_column :decidim_proposals_proposals, :new_title, :string
     add_column :decidim_proposals_proposals, :new_body, :string
 
-    reset_column_information
-
-    Decidim::Proposals::Proposal.find_each do |proposal|
+    Proposal.find_each do |proposal|
       proposal.new_title = proposal.title.values.first
       proposal.new_body = proposal.body.values.first
 
@@ -63,15 +82,6 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
-
-    reset_column_information
-  end
-
-  def reset_column_information
-    Decidim::User.reset_column_information
-    Decidim::Coauthorship.reset_column_information
-    Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Organization.reset_column_information
   end
 
   def remove_indexs

data/db/migrate/20201002085508_fix_proposals_data.rb

@@ -1,14 +1,35 @@
 # frozen_string_literal: true
 
 class FixProposalsData < ActiveRecord::Migration[5.2]
-  def up
-    reset_column_information
+  class Proposal < ApplicationRecord
+    self.table_name = :decidim_proposals_proposals
+  end
+
+  class Coauthorship < ApplicationRecord
+    self.table_name = :decidim_coauthorships
+  end
+
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
 
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def up
     PaperTrail.request(enabled: false) do
-      Decidim::Proposals::Proposal.find_each do |proposal|
+      Proposal.find_each do |proposal|
         next if proposal.title.is_a?(Hash) && proposal.body.is_a?(Hash)
 
-        author = proposal.coauthorships.first.author
+        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
+        author =
+          if coauthorship.decidim_author_type == "Decidim::Organization"
+            Organization.find_by(id: coauthorship.decidim_author_id)
+          else
+            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
+          end
 
         locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
 
@@ -21,16 +42,7 @@ class FixProposalsData < ActiveRecord::Migration[5.2]
         # rubocop:enable Rails/SkipsModelValidations
       end
     end
-
-    reset_column_information
   end
 
   def down; end
-
-  def reset_column_information
-    Decidim::User.reset_column_information
-    Decidim::Coauthorship.reset_column_information
-    Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Organization.reset_column_information
-  end
 end

data/lib/decidim/proposals/engine.rb

@@ -90,6 +90,12 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Proposals::Engine.root}/app/views") # for proposal partials
       end
 
+      initializer "decidim_proposals.remove_space_admins" do
+        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
+          Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
+        end
+      end
+
       initializer "decidim_proposals.add_badges" do
         Decidim::Gamification.register_badge(:proposals) do |badge|
           badge.levels = [1, 5, 10, 30, 60]

data/lib/decidim/proposals/version.rb

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

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :proposals do
+    namespace :upgrade do
+      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")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::ParticipatoryProcessUserRole")
+            .where
+            .not(valuator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
+            .destroy_all
+        end
+
+        if Decidim.module_installed?("assemblies")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::AssemblyUserRole")
+            .where
+            .not(valuator_role_id: Decidim::AssemblyUserRole.pluck(:id))
+            .destroy_all
+        end
+
+        if Decidim.module_installed?("conferences")
+          Decidim::Proposals::ValuationAssignment
+            .where(valuator_role_type: "Decidim::ConferenceUserRole")
+            .where
+            .not(valuator_role_id: Decidim::ConferenceUserRole.pluck(:id))
+            .destroy_all
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.26.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-07-27 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.26.7
+        version: 0.26.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
+- !ruby/object:Gem::Dependency
+  name: decidim-conference
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.26.8
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -447,6 +461,7 @@ files:
 - app/views/decidim/proposals/versions/show.html.erb
 - config/assets.rb
 - config/brakeman.ignore
+- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -607,6 +622,7 @@ files:
 - lib/decidim/proposals/test/factories.rb
 - lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
+- lib/tasks/proposals/upgrade/decdim_proposal_upgrade_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0