decidim-proposals 0.26.0 → 0.27.0.rc1

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -41,10 +42,6 @@ tr:
           valuator_role_id: Bilirkişi adı
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz doküman tipi. Kabul edilen formatlar: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -185,33 +182,21 @@ tr:
             email_subject: Birisi %{resource_title} teklifine not bıraktı.
             notification_title: Birisi teklif <a href="%{resource_path}">%{resource_title} </a> hakkında bir not bıraktı. <a href="%{admin_proposal_info_path}"> Yönetici panelinden </a> kontrol edin
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name}, <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına katkıda bulunan kişi olarak erişim için kabul edildi.'
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olduğunuz için aldınız.
           email_subject: "%{requester_name}, %{resource_title} katkı sağlayıcısı olarak erişim için kabul edildi."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname} </a> için <strong> katkıda bulunan </strong> olarak erişim için kabul edildi <a href = "%{resource_path}">%{resource_title} </a> ortak çalışma taslağı.
         collaborative_draft_access_rejected:
-          email_intro: '<a href="%{resource_path}">%{resource_title}</a> işbirlikçi taslağın katılımcısı olarak erişim için %{requester_name} reddedildi.'
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olduğunuz için aldınız.
           email_subject: "%{requester_name}, %{resource_title} ortak çalışma taslağına katkıda bulunan kişi olarak erişimi reddedildi."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> , <a href="%{resource_path}">%{resource_title}</a> işbirlikçi taslağın bir katkıcısı</strong> olarak erişmek için <strong>reddedilmiştir.
         collaborative_draft_access_requested:
-          email_intro: '%{requester_name} katkıda bulunan olarak erişim istedi. <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslak sayfasından <strong> isteği kabul edebilir veya reddedebilirsiniz </strong>.'
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olduğunuz için aldınız.
           email_subject: "%{requester_name}, %{resource_title} kaynağına katkıda bulunmak için erişim istedi."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname} </a>, <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına katkıda bulunmak için erişim istedi. Lütfen <strong> isteği kabul edin veya reddedin </strong>.
         collaborative_draft_access_requester_accepted:
-          email_intro: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına katkıda bulunan olarak erişmeniz kabul edildi.
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olmayı talep ettiğiniz için aldınız.
           email_subject: '%{resource_title} katılımcısı olarak kabul edildiniz.'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına <strong> katkıda bulunan kişi olarak erişmeniz kabul edildi </strong>.
         collaborative_draft_access_requester_rejected:
-          email_intro: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına katkıda bulunan olarak erişiminiz reddedildi.
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olmayı talep ettiğiniz için aldınız.
           email_subject: '%{resource_title} katılımcısı olarak reddedildiniz.'
           notification_title: <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağına <strong> katkıda bulunan olarak erişiminiz reddedildi </strong>.
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname} </a>, <a href="%{resource_path}">%{resource_title} </a> ortak çalışma taslağını geri çekti.
-          email_outro: Bu bildirimi, <a href="%{resource_path}">%{resource_title} </a> ortak çalışanı olduğunuz için aldınız.
           email_subject: "%{author_name} %{author_nickname}, %{resource_title} ortak çalışma taslağını geri çekti."
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname} </a> <a href="%{resource_path}">%{resource_title} </a> işbirlikçi taslak öğesini <strong> geri çekti </strong>.
         creation_enabled:
@@ -531,7 +516,6 @@ tr:
           all: Tümü
         filter_origin_values:
           all: Tümü
-          citizens: Vatandaşlar
           meetings: Toplantılar
           official: Resmi
           user_groups: Gruplar
@@ -702,12 +686,8 @@ tr:
             one: "%{count} teklif"
             other: "%{count} teklif"
         edit:
-          add_documents: Dokümanlar
-          add_images: Dosya
           attachment_legend: "(İsteğe bağlı) Bir ek ekleyin"
           back: Geri
-          delete_document: Doküman Sil
-          delete_image: Resmi sil
           gallery_legend: "(İsteğe bağlı) Teklif kartına bir resim ekleyin"
           select_a_category: Lütfen bir kategori seçin
           send: Gönder
@@ -746,7 +726,6 @@ tr:
             other: destekler
         new:
           send: Devam et
-          title: Teklifinizi Oluşturun
         orders:
           label: 'Teklifleri şuna göre sırala:'
           most_commented: En çok yorum yapılan

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ uk:
         withdrawn: Відкликана
       application_helper:
         filter_origin_values:
-          citizens: Громадяни
           official: Службове
         filter_state_values:
           not_answered: Без відповідей
@@ -292,7 +292,6 @@ uk:
             other: голосів
         new:
           send: Продовжити
-          title: Внесіть свою пропозицію
         orders:
           label: 'Впорядкувати пропозиції за:'
           most_voted: Отримали найбільше голосів

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -38,10 +39,6 @@ zh-CN:
           valuator_role_id: 值名称
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接受的格式为： %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -178,30 +175,19 @@ zh-CN:
             email_subject: 有人在建议 %{resource_title} 留下了一条笔记。
             notification_title: 有人在提议 <a href="%{resource_path}">%{resource_title}</a>留下了一条笔记。请在 <a href="%{admin_proposal_info_path}">管理面板</a>
         collaborative_draft_access_accepted:
-          email_intro: '%{requester_name} 已被接受作为贡献者访问 <a href="%{resource_path}">%{resource_title}</a> 协作草案。'
-          email_outro: 您收到此通知是因为您是 <a href="%{resource_path}">%{resource_title}的合作者</a>
           email_subject: "%{requester_name} 已被接受作为贡献者访问 %{resource_title}。"
         collaborative_draft_access_rejected:
-          email_intro: '%{requester_name} 已被拒绝以贡献者身份访问 <a href="%{resource_path}">%{resource_title}</a> 协作草稿。'
-          email_outro: 您收到此通知是因为您是 <a href="%{resource_path}">%{resource_title}的合作者</a>
           email_subject: "%{requester_name} 在 %{resource_title} 协作草稿中的贡献者被拒绝访问。"
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 已被 <strong>拒绝以贡献者身份访问</strong> <a href="%{resource_path}">%{resource_title}</a> 合作草稿。
         collaborative_draft_access_requested:
-          email_outro: 您收到此通知是因为您是 <a href="%{resource_path}">%{resource_title}的合作者</a>
           email_subject: "%{requester_name} 请求访问权限为 %{resource_title} 捐款。"
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> 请求访问权限以便为 <a href="%{resource_path}">%{resource_title}</a> 协作草稿。请 <strong>接受或拒绝请求</strong>
         collaborative_draft_access_requester_accepted:
-          email_intro: 您已被接受作为 <a href="%{resource_path}">%{resource_title}</a> 协作草稿的贡献者访问权限。
-          email_outro: 您收到此通知是因为您请求成为 <a href="%{resource_path}">%{resource_title}</a> 的合作者。
           email_subject: 您已被接受为 %{resource_title} 的贡献者。
         collaborative_draft_access_requester_rejected:
-          email_intro: 您已被拒绝以贡献者身份访问 <a href="%{resource_path}">%{resource_title}</a> 协作草稿。
-          email_outro: 您收到此通知是因为您请求成为 <a href="%{resource_path}">%{resource_title}</a> 的合作者。
           email_subject: 您已被拒绝为 %{resource_title} 的贡献者。
           notification_title: 您在 <a href="%{resource_path}">%{resource_title}</a> 协作草稿中的 <strong>被拒绝作为贡献者</strong> 访问。
         collaborative_draft_withdrawn:
-          email_intro: <a href="%{author_path}">%{author_name} %{author_nickname}</a> 撤回了 <a href="%{resource_path}">%{resource_title}</a> 协作草稿。
-          email_outro: 您收到此通知是因为您是 <a href="%{resource_path}">%{resource_title}的合作者</a>
           email_subject: "%{author_name} %{author_nickname} 撤销了 %{resource_title} 协作草稿。"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> <strong>撤回</strong> <a href="%{resource_path}">%{resource_title}</a> 协作草稿。
         creation_enabled:
@@ -510,7 +496,6 @@ zh-CN:
           all: 所有的
         filter_origin_values:
           all: 所有的
-          citizens: Citizens
           meetings: 会议
           official: 官方的
           user_groups: 群組
@@ -675,12 +660,8 @@ zh-CN:
           proposals_count:
             other: "%{count} 个提议"
         edit:
-          add_documents: www.un.org/webcast
-          add_images: 文件
           attachment_legend: "(可选) 添加附件"
           back: 后退
-          delete_document: 删除文档
-          delete_image: 删除图像
           gallery_legend: "(可选) 添加图像到提案卡"
           select_a_category: 请选择一个类别
           send: 发送
@@ -718,7 +699,6 @@ zh-CN:
             other: 支持
         new:
           send: 继续
-          title: 创建您的提议
         orders:
           label: '排序提议：'
           most_commented: 最多评论

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb

@@ -4,6 +4,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end

data/lib/decidim/content_parsers/proposal_parser.rb

@@ -12,89 +12,33 @@ module Decidim
     # Also fills a `Metadata#linked_proposals` attribute.
     #
     # @see BaseParser Examples of how to use a content parser
-    class ProposalParser < BaseParser
+    class ProposalParser < ResourceParser
       # Class used as a container for metadata
       #
       # @!attribute linked_proposals
       #   @return [Array] an array of Decidim::Proposals::Proposal mentioned in content
       Metadata = Struct.new(:linked_proposals)
 
-      # Matches a URL
-      URL_REGEX_SCHEME = '(?:http(s)?:\/\/)'
-      URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
-      URL_REGEX_END_CHAR = '[\d]'
-      URL_REGEX = %r{#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}/proposals/#{URL_REGEX_END_CHAR}+}i.freeze
-      # Matches a mentioned Proposal ID (~(d)+ expression)
-      ID_REGEX = /~(\d+)/.freeze
-
       def initialize(content, context)
         super
         @metadata = Metadata.new([])
       end
 
-      # Replaces found mentions matching an existing
-      # Proposal with a global id for that Proposal. Other mentions found that doesn't
-      # match an existing Proposal are returned as they are.
-      #
-      # @return [String] the content with the valid mentions replaced by a global id.
-      def rewrite
-        rewrited_content = parse_for_urls(content)
-        parse_for_ids(rewrited_content)
-      end
-
       # (see BaseParser#metadata)
       attr_reader :metadata
 
       private
 
-      def parse_for_urls(content)
-        content.gsub(URL_REGEX) do |match|
-          proposal = proposal_from_url_match(match)
-          if proposal
-            @metadata.linked_proposals << proposal.id
-            proposal.to_global_id
-          else
-            match
-          end
-        end
-      end
-
-      def parse_for_ids(content)
-        content.gsub(ID_REGEX) do |match|
-          proposal = proposal_from_id_match(Regexp.last_match(1))
-          if proposal
-            @metadata.linked_proposals << proposal.id
-            proposal.to_global_id
-          else
-            match
-          end
-        end
-      end
-
-      def proposal_from_url_match(match)
-        uri = URI.parse(match)
-        return if uri.path.blank?
-
-        proposal_id = uri.path.split("/").last
-        find_proposal_by_id(proposal_id)
-      rescue URI::InvalidURIError
-        Rails.logger.error("#{e.message}=>#{e.backtrace}")
-        nil
+      def url_regex
+        %r{#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}/proposals/#{URL_REGEX_END_CHAR}+}i
       end
 
-      def proposal_from_id_match(match)
-        proposal_id = match
-        find_proposal_by_id(proposal_id)
+      def model_class
+        "Decidim::Proposals::Proposal"
       end
 
-      def find_proposal_by_id(id)
-        if id.present?
-          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
-            manifest.participatory_spaces.call(context[:current_organization]).public_spaces
-          end
-          components = Component.where(participatory_space: spaces).published
-          Decidim::Proposals::Proposal.where(component: components).find_by(id: id)
-        end
+      def update_metadata(resource)
+        @metadata.linked_proposals << resource.id
       end
     end
   end

data/lib/decidim/content_renderers/proposal_renderer.rb

@@ -8,25 +8,9 @@ module Decidim
     # e.g. gid://<APP_NAME>/Decidim::Proposals::Proposal/1
     #
     # @see BaseRenderer Examples of how to use a content renderer
-    class ProposalRenderer < BaseRenderer
-      # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid://([\w-]*/Decidim::Proposals::Proposal/(\d+))}i.freeze
-
-      # Replaces found Global IDs matching an existing proposal with
-      # a link to its show page. The Global IDs representing an
-      # invalid Decidim::Proposals::Proposal are replaced with '???' string.
-      #
-      # @return [String] the content ready to display (contains HTML)
-      def render(_options = nil)
-        return content unless content.respond_to?(:gsub)
-
-        content.gsub(GLOBAL_ID_REGEX) do |proposal_gid|
-          proposal = GlobalID::Locator.locate(proposal_gid)
-          Decidim::Proposals::ProposalPresenter.new(proposal).display_mention
-        rescue ActiveRecord::RecordNotFound
-          proposal_id = proposal_gid.split("/").last
-          "~#{proposal_id}"
-        end
+    class ProposalRenderer < ResourceRenderer
+      def regex
+        %r{gid://([\w-]*/Decidim::Proposals::Proposal/(\d+))}i
       end
     end
   end

data/lib/decidim/proposals/component.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/components/namer"
+require "decidim/meetings"
 
 Decidim.register_component(:proposals) do |component|
   component.engine = Decidim::Proposals::Engine
@@ -65,11 +66,11 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :votes_blocked, type: :boolean
     settings.attribute :votes_hidden, type: :boolean, default: false
     settings.attribute :comments_blocked, type: :boolean, default: false
-    settings.attribute :creation_enabled, type: :boolean
+    settings.attribute :creation_enabled, type: :boolean, readonly: ->(context) { context[:component].settings[:participatory_texts_enabled] }
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
-    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :publish_answers_immediately, type: :boolean, default: true
     settings.attribute :answers_with_costs, type: :boolean, default: false
+    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
@@ -265,26 +266,31 @@ Decidim.register_component(:proposals) do |component|
         visibility: "all"
       ) do
         proposal = Decidim::Proposals::Proposal.new(params)
-        proposal.add_coauthor(participatory_space.organization)
+        meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+
+        coauthor = case n
+                   when 0
+                     Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 1
+                     Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 2
+                     Decidim::Meetings::Meeting.where(component: meeting_component).order(Arel.sql("RANDOM()")).first
+                   else
+                     participatory_space.organization
+                   end
+        proposal.add_coauthor(coauthor)
         proposal.save!
         proposal
       end
 
-      if n.positive?
-        Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
-        end
-      end
-
       if proposal.state.nil?
         email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "password1234",
-          password_confirmation: "password1234",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -349,8 +355,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "password1234",
-          password_confirmation: "password1234",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -371,8 +377,8 @@ Decidim.register_component(:proposals) do |component|
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "password1234",
-            password_confirmation: "password1234",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,

data/lib/decidim/proposals/import/proposal_answer_creator.rb

@@ -40,26 +40,28 @@ module Decidim
         private
 
         def resource
-          @resource ||= begin
-            proposal = Decidim::Proposals::Proposal.find_by(id: id)
-            return nil unless proposal
-            return nil if proposal.emendation?
-
-            if proposal.component != component
-              proposal.errors.add(:component, :invalid)
-              return proposal
-            end
-
-            proposal.answer = answer
-            proposal.answered_at = Time.current
-            if POSSIBLE_ANSWER_STATES.include?(state)
-              proposal.state = state
-              proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
-            else
-              proposal.errors.add(:state, :invalid)
-            end
-            proposal
+          @resource ||= fetch_resource
+        end
+
+        def fetch_resource
+          proposal = Decidim::Proposals::Proposal.find_by(id: id)
+          return nil unless proposal
+          return nil if proposal.emendation?
+
+          if proposal.component != component
+            proposal.errors.add(:component, :invalid)
+            return proposal
+          end
+
+          proposal.answer = answer
+          proposal.answered_at = Time.current
+          if POSSIBLE_ANSWER_STATES.include?(state)
+            proposal.state = state
+            proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
+          else
+            proposal.errors.add(:state, :invalid)
           end
+          proposal
         end
 
         def id

data/lib/decidim/proposals/import/proposal_creator.rb

@@ -33,7 +33,10 @@ module Decidim
 
         # Saves the proposal
         def finish!
-          super # resource.save!
+          Decidim.traceability.perform_action!(:create, self.class.resource_klass, context[:current_user], visibility: "admin-only") do
+            resource.save!
+            resource
+          end
           notify(resource)
           publish(resource)
         end

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

@@ -305,7 +305,7 @@ FactoryBot.define do
       published_at { nil }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       after :build do |proposal|
         proposal.coauthorships.clear
         user = build(:user, organization: proposal.component.participatory_space.organization)

data/lib/decidim/proposals/version.rb

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