decidim-proposals 0.27.6 → 0.27.8

data/config/locales/ru.yml

@@ -83,7 +83,6 @@ ru:
             proposal_wizard_step_1_help_text: Справка мастера предложений о шаге "Создать"
             proposal_wizard_step_2_help_text: Справка мастера предложений о шаге "Сравнить"
             proposal_wizard_step_3_help_text: Справка мастера предложений о шаге "Завершить"
-            proposal_wizard_step_4_help_text: Справка мастера предложений о шаге "Обнародовать"
             resources_permissions_enabled: Для каждого предложения можно задать те или иные разрешения на действия
             threshold_per_proposal: Порог для каждого предложения
             vote_limit: Предельное количество голосов для одного участника
@@ -271,7 +270,6 @@ ru:
           no_similars_found: Хорошая работа! Подобных предложений не найдено
           title: Похожие предложения
         complete:
-          send: Отправить
           title: Завершите свое предложение
         edit:
           attachment_legend: "(Необязательно) Добавить вложение"
@@ -358,6 +356,7 @@ ru:
           vote_limit:
             description: Вы можете проголосовать до %{limit} предложений.
             left: Осталось
+            votes: Голоса
         wizard_aside:
           back: Вернуться
           info: Вы создаете <strong>предложение</strong>.

data/config/locales/sk.yml

@@ -130,7 +130,6 @@ sk:
             proposal_wizard_step_1_help_text: Pomocný text Sprievodcu "Vytvoriť" návrh
             proposal_wizard_step_2_help_text: Pomocný text Sprievodcu "Porovnať" návrhu
             proposal_wizard_step_3_help_text: Pomocný text Sprievodcu "Dokončiť" návrh
-            proposal_wizard_step_4_help_text: Pomocný text Sprievodcu "Publikovať" návrh
             resources_permissions_enabled: Pre každý návrh možno nastaviť povolenia akcie
             threshold_per_proposal: Maximálny limit na návrh
             vote_limit: Počet hlasov na užívateľa

data/config/locales/sv.yml

@@ -171,7 +171,6 @@ sv:
             proposal_wizard_step_1_help_text: Hjälptext till steget "Skapa" i förslagsguiden
             proposal_wizard_step_2_help_text: Hjälptext till steget "Jämför" i förslagsguiden
             proposal_wizard_step_3_help_text: Hjälptext till steget "Komplettera" i förslagsguiden
-            proposal_wizard_step_4_help_text: Förslagsguidens hjälptext för steg "Publicera"
             resources_permissions_enabled: Åtgärdsbehörigheter kan ställas in för varje förslag
             scope_id: Omfång
             scopes_enabled: Omfång aktiverade

data/config/locales/tr-TR.yml

@@ -143,7 +143,7 @@ tr:
             proposal_wizard_step_1_help_text: Teklif sihirbazı "Oluştur" adımı yardım metni
             proposal_wizard_step_2_help_text: Teklif sihirbazı "Karşılaştır" adımı yardım metni
             proposal_wizard_step_3_help_text: Teklif sihirbazı "Tamamlandı" adımı yardım metni
-            proposal_wizard_step_4_help_text: Teklif sihirbazı "Yayınla" adımı yardım metni
+            proposal_wizard_step_4_help_text: Teklif "Yayınlama"  sihirbazı  yardım metni
             resources_permissions_enabled: Her teklif için işlem izinleri ayarlanabilir
             scope_id: Kapsam
             scopes_enabled: Kapsamlar etkinleştirildi
@@ -818,7 +818,7 @@ tr:
         wizard_aside:
           back: Geri
           back_from_step_1: Teklifte geri dön
-          back_from_step_2: Tekliflere geri dön
+          back_from_step_2: Teklifte geri dön
           back_from_step_3: Teklifleri karşılaştırmaya geri dön
           back_from_step_4: Taslağı düzenlemeye dön
           info: <strong>teklif</strong>.

data/config/locales/uk.yml

@@ -83,7 +83,6 @@ uk:
             proposal_wizard_step_1_help_text: Довідка майстра пропозицій щодо кроку "Створити"
             proposal_wizard_step_2_help_text: Довідка майстра пропозицій щодо кроку "Порівняти"
             proposal_wizard_step_3_help_text: Довідка майстра пропозицій щодо кроку "Завершити"
-            proposal_wizard_step_4_help_text: Довідка майстра пропозицій щодо кроку "Оприлюднити"
             resources_permissions_enabled: Для кожної пропозиції можна встановити ті чи інші дозволи на дії
             threshold_per_proposal: Поріг на кожну пропозицію
             vote_limit: Гранична кількість голосів від одного учасника
@@ -271,7 +270,6 @@ uk:
           no_similars_found: Гарна робота! Не знайдено схожий пропозицій
           title: Подібні пропозиції
         complete:
-          send: Надіслати
           title: Завершіть свою пропозицію
         edit:
           attachment_legend: "(Необов'язково) Додати вкладений файл"
@@ -358,6 +356,7 @@ uk:
           vote_limit:
             description: Ви можете проголосувати до %{limit} пропозицій.
             left: Залишилось
+            votes: Голоси
         wizard_aside:
           back: Повернутись
           info: Ви вносите <strong>пропозицію</strong>.

data/config/locales/zh-CN.yml

@@ -136,7 +136,6 @@ zh-CN:
             proposal_wizard_step_1_help_text: 建议向导“创建”步骤帮助文本
             proposal_wizard_step_2_help_text: 建议向导“Compare”步骤帮助文本
             proposal_wizard_step_3_help_text: 建议向导“完成”步骤帮助文本
-            proposal_wizard_step_4_help_text: 建议向导"发布"步骤帮助文本
             resources_permissions_enabled: 每个提案都可以设置动作权限
             scope_id: 范围
             scopes_enabled: 范围已启用

data/config/locales/zh-TW.yml

@@ -171,7 +171,6 @@ zh-TW:
             proposal_wizard_step_1_help_text: 提案向導「創建」步驟說明文字
             proposal_wizard_step_2_help_text: 提案向導「比較」步驟說明文字
             proposal_wizard_step_3_help_text: 提案向導「完成」步驟說明文字
-            proposal_wizard_step_4_help_text: 提案向導「發佈」步驟說明文字
             resources_permissions_enabled: 每個提案都可以設定行動權限
             scope_id: 範圍
             scopes_enabled: 啟用範圍

data/lib/decidim/proposals/proposal_serializer.rb

@@ -19,6 +19,9 @@ module Decidim
       def serialize
         {
           id: proposal.id,
+          author: {
+            **author_fields
+          },
           category: {
             id: proposal.category.try(:id),
             name: proposal.category.try(:name) || empty_translatable
@@ -102,6 +105,54 @@ module Decidim
 
         convert_to_text(value)
       end
+
+      def author_fields
+        is_author_user_group = resource.coauthorships.map(&:decidim_user_group_id).any?
+
+        {
+          id: resource.authors.map(&:id),
+          name: resource.authors.map do |author|
+            author_name(is_author_user_group ? resource.coauthorships.first.user_group : author)
+          end,
+          url: resource.authors.map do |author|
+            author_url(is_author_user_group ? resource.coauthorships.first.user_group : author)
+          end
+        }
+      end
+
+      def author_name(author)
+        if author.respond_to?(:name)
+          translated_attribute(author.name) # is a Decidim::User or Decidim::Organization or Decidim::UserGroup
+        elsif author.respond_to?(:title)
+          translated_attribute(author.title) # is a Decidim::Meetings::Meeting
+        end
+      end
+
+      def author_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author.nickname) # is a Decidim::User or Decidim::UserGroup
+        elsif author.respond_to?(:title)
+          meeting_url(author) # is a Decidim::Meetings::Meeting
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+
+      def profile_url(nickname)
+        Decidim::Core::Engine.routes.url_helpers.profile_url(nickname, host: host)
+      end
+
+      def meeting_url(meeting)
+        Decidim::EngineRouter.main_proxy(meeting.component).meeting_url(id: meeting.id, host: host)
+      end
+
+      def root_url
+        Decidim::Core::Engine.routes.url_helpers.root_url(host: host)
+      end
+
+      def host
+        resource.organization.host
+      end
     end
   end
 end

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

@@ -409,6 +409,12 @@ FactoryBot.define do
         proposal.attachments << create(:attachment, :with_pdf, attached_to: proposal, skip_injection: evaluator.skip_injection)
       end
     end
+
+    trait :moderated do
+      after(:create) do |proposal, evaluator|
+        create(:moderation, reportable: proposal, hidden_at: 2.days.ago, skip_injection: evaluator.skip_injection)
+      end
+    end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
@@ -433,7 +439,13 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
-    body { Faker::Lorem.sentences(number: 3).join("\n") }
+    body do
+      if skip_injection
+        generate(:title)
+      else
+        "<script>alert(\"proposal_note_body\");</script> #{generate(:title)}"
+      end
+    end
     proposal { build(:proposal, skip_injection: skip_injection) }
     author { build(:user, organization: proposal.organization, skip_injection: skip_injection) }
   end

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.27.6
+  version: 0.27.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-07-30 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.27.6
+        version: 0.27.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.27.8
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -363,7 +363,6 @@ files:
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb
 - app/presenters/decidim/proposals/collaborative_draft_presenter.rb
-- app/presenters/decidim/proposals/log/resource_presenter.rb
 - app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/official_author_presenter.rb
 - app/presenters/decidim/proposals/proposal_presenter.rb
@@ -628,7 +627,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -643,8 +642,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.5.14
+signing_key:
 specification_version: 4
 summary: Decidim proposals module
 test_files: []

data/app/presenters/decidim/proposals/log/resource_presenter.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Log
-      class ResourcePresenter < Decidim::Log::ResourcePresenter
-        private
-
-        # Private: Presents resource name.
-        #
-        # Returns an HTML-safe String.
-        def present_resource_name
-          if resource.present?
-            Decidim::Proposals::ProposalPresenter.new(resource).title
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end