decidim-proposals 0.18.1 → 0.19.0

data/config/locales/tr-TR.yml

@@ -77,6 +77,7 @@ tr:
     components:
       proposals:
         actions:
+          amend: Değiştir
           create: yaratmak
           endorse: desteklemek
           vote: Oy
@@ -85,6 +86,7 @@ tr:
         settings:
           global:
             amendments_enabled: Değişiklikler etkinleştirildi
+            amendments_enabled_help: Etkin ise, her adım için Yasa Değişikliği özelliklerini yapılandırın.
             announcement: duyuru
             attachments_allowed: Eklere izin ver
             can_accumulate_supports_beyond_threshold: Destekleri eşiğin ötesinde biriktirebilir
@@ -107,6 +109,10 @@ tr:
             threshold_per_proposal: Teklif başına eşik
             vote_limit: Kullanıcı başına oy sınırı
           step:
+            amendment_creation_enabled: Yasa değişikliği oluşturma etkinleştirildi
+            amendment_creation_enabled_help: Katılımcı teklifleri değiştirebilir.
+            amendment_promotion_enabled: Değişiklik tanıtımı etkinleştirildi
+            amendment_reaction_enabled: Değişikliğe karşı çıkma etkinleştirildi
             announcement: duyuru
             automatic_hashtags: Hashtags tüm tekliflere eklendi
             comments_blocked: Yorumlar engellendi
@@ -684,6 +690,7 @@ tr:
             other: ve %{count} kişi daha
           link_to_collaborative_draft_help_text: Bu teklif, işbirlikçi bir taslağın sonucudur. Geçmişi gözden geçirin
           link_to_collaborative_draft_text: Ortak taslaka bakın
+          link_to_proposal_from_emendation_text: Öneriye bakın
           proposal_accepted_reason: 'Bu teklif kabul edildi çünkü:'
           proposal_in_evaluation_reason: Bu teklif değerlendiriliyor
           proposal_rejected_reason: 'Bu teklif reddedildi çünkü:'

data/lib/decidim/content_parsers/proposal_parser.rb

@@ -23,9 +23,9 @@ module Decidim
       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
+      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+)/
+      ID_REGEX = /~(\d+)/.freeze
 
       def initialize(content, context)
         super

data/lib/decidim/content_renderers/proposal_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @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
+      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

data/lib/decidim/proposals/commentable_proposal.rb

@@ -31,6 +31,7 @@ module Decidim
         # Public: Override Commentable concern method `users_to_notify_on_comment_created`
         def users_to_notify_on_comment_created
           return (followers | component.participatory_space.admins).uniq if official?
+
           followers
         end
 

data/lib/decidim/proposals/component.rb

@@ -15,7 +15,7 @@ Decidim.register_component(:proposals) do |component|
 
   component.newsletter_participant_entities = ["Decidim::Proposals::Proposal"]
 
-  component.actions = %w(endorse vote create withdraw)
+  component.actions = %w(endorse vote create withdraw amend)
 
   component.query_type = "Decidim::Proposals::ProposalsType"
 
@@ -38,6 +38,7 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :collaborative_drafts_enabled, type: :boolean, default: false
     settings.attribute :participatory_texts_enabled, type: :boolean, default: false
     settings.attribute :amendments_enabled, type: :boolean, default: false
+    settings.attribute :amendments_wizard_help_text, type: :text, translated: true, editor: true, required: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :new_proposal_help_text, type: :text, translated: true, editor: true
     settings.attribute :proposal_wizard_step_1_help_text, type: :text, translated: true, editor: true
@@ -55,6 +56,10 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    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
+    settings.attribute :amendments_visibility, type: :string, default: "all"
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :automatic_hashtags, type: :text, editor: false, required: false
     settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
@@ -64,7 +69,7 @@ Decidim.register_component(:proposals) do |component|
     resource.model_class_name = "Decidim::Proposals::Proposal"
     resource.template = "decidim/proposals/proposals/linked_proposals"
     resource.card = "decidim/proposals/proposal"
-    resource.actions = %w(endorse vote)
+    resource.actions = %w(endorse vote amend)
     resource.searchable = true
   end
 
@@ -78,7 +83,7 @@ Decidim.register_component(:proposals) do |component|
   end
 
   component.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
-    Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.count
+    Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.not_hidden.count
   end
 
   component.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|

data/lib/decidim/proposals/engine.rb

@@ -51,7 +51,6 @@ module Decidim
 
       initializer "decidim_proposals.assets" do |app|
         app.config.assets.precompile += %w(decidim_proposals_manifest.js
-                                           decidim_proposals_manifest.css
                                            decidim/proposals/identity_selector_dialog.js)
       end
 

data/lib/decidim/proposals/markdown_to_proposals.rb

@@ -126,6 +126,8 @@ module Decidim
 
       private
 
+      # Prevents PaperTrail from creating versions while producing proposals from a document.
+      # A first version will be created when publishing the Participatory Text.
       def create_proposal(title, body, participatory_text_level)
         attributes = {
           component: @component,
@@ -134,15 +136,17 @@ module Decidim
           participatory_text_level: participatory_text_level
         }
 
-        proposal = Decidim::Proposals::ProposalBuilder.create(
-          attributes: attributes,
-          author: @component.organization,
-          action_user: @current_user
-        )
+        PaperTrail.request(enabled: false) do
+          proposal = Decidim::Proposals::ProposalBuilder.create(
+            attributes: attributes,
+            author: @component.organization,
+            action_user: @current_user
+          )
 
-        @last_position = proposal.position
+          @last_position = proposal.position
 
-        proposal
+          proposal
+        end
       end
     end
   end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -37,14 +37,22 @@ module Decidim
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
           supports: proposal.proposal_votes_count,
-          endorsements: proposal.endorsements.count,
+          endorsements: {
+            total_count: proposal.endorsements.count,
+            user_endorsements: user_endorsements
+          },
           comments: proposal.comments.count,
           attachments: proposal.attachments.count,
           followers: proposal.followers.count,
           published_at: proposal.published_at,
           url: url,
           meeting_urls: meetings,
-          related_proposals: related_proposals
+          related_proposals: related_proposals,
+          is_amend: proposal.emendation?,
+          original_proposal: {
+            title: proposal&.amendable&.title,
+            url: original_proposal_url
+          }
         }
       end
 
@@ -71,6 +79,16 @@ module Decidim
       def url
         Decidim::ResourceLocatorPresenter.new(proposal).url
       end
+
+      def user_endorsements
+        proposal.endorsements.for_listing.map { |identity| identity.normalized_author&.name }
+      end
+
+      def original_proposal_url
+        return unless proposal.emendation? && proposal.amendable.present?
+
+        Decidim::ResourceLocatorPresenter.new(proposal.amendable).url
+      end
     end
   end
 end

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -152,104 +152,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: social-share-button
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -262,7 +248,6 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/admin/decidim_proposals_manifest.js
-- app/assets/config/decidim_proposals_manifest.css
 - app/assets/config/decidim_proposals_manifest.js
 - app/assets/documents/decidim/proposals/participatory_texts/participatory_text.md
 - app/assets/documents/decidim/proposals/participatory_texts/participatory_text.odt
@@ -274,9 +259,7 @@ files:
 - app/assets/javascripts/decidim/proposals/admin/proposals.es6
 - app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6
 - app/assets/javascripts/decidim/proposals/identity_selector_dialog.js.es6
-- app/assets/javascripts/decidim/proposals/social_share.js
 - app/assets/javascripts/decidim/proposals/utils.js.es6
-- app/assets/stylesheets/decidim/proposals/social_share.css.scss
 - app/cells/decidim/proposals/collaborative_draft_cell.rb
 - app/cells/decidim/proposals/collaborative_draft_link_to_proposal/show.erb
 - app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb
@@ -296,8 +279,11 @@ files:
 - app/cells/decidim/proposals/participatory_text_proposal_cell.rb
 - app/cells/decidim/proposals/proposal_activity_cell.rb
 - app/cells/decidim/proposals/proposal_cell.rb
-- app/cells/decidim/proposals/proposal_link_to_collaborative_draft/show.erb
 - app/cells/decidim/proposals/proposal_link_to_collaborative_draft_cell.rb
+- app/cells/decidim/proposals/proposal_link_to_rejected_emendation/show.erb
+- app/cells/decidim/proposals/proposal_link_to_rejected_emendation_cell.rb
+- app/cells/decidim/proposals/proposal_linked_resources/show.erb
+- app/cells/decidim/proposals/proposal_linked_resources_cell.rb
 - app/cells/decidim/proposals/proposal_m/footer.erb
 - app/cells/decidim/proposals/proposal_m/tags.erb
 - app/cells/decidim/proposals/proposal_m_cell.rb
@@ -322,6 +308,7 @@ files:
 - app/commands/decidim/proposals/create_proposal_export.rb
 - app/commands/decidim/proposals/destroy_proposal.rb
 - app/commands/decidim/proposals/endorse_proposal.rb
+- app/commands/decidim/proposals/gallery_methods.rb
 - app/commands/decidim/proposals/hashtags_methods.rb
 - app/commands/decidim/proposals/publish_collaborative_draft.rb
 - app/commands/decidim/proposals/publish_proposal.rb
@@ -513,7 +500,6 @@ files:
 - app/views/decidim/proposals/versions/_version.html.erb
 - app/views/decidim/proposals/versions/index.html.erb
 - app/views/decidim/proposals/versions/show.html.erb
-- config/initializers/social_share_button.rb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
 - config/locales/ca.yml

data/app/assets/config/decidim_proposals_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/proposals/social_share.css.scss
- */

data/app/assets/javascripts/decidim/proposals/social_share.js

@@ -1,2 +0,0 @@
-// = require social-share-button
-// = require_self

data/app/assets/stylesheets/decidim/proposals/social_share.css.scss

@@ -1,22 +0,0 @@
-/*
- *= require social-share-button
- */
-
-$size: 45px;
-
-.share-link:hover{
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.social-share-button{
-  display: inline-block;
-  vertical-align: top;
-
-  .ssb-icon{
-    margin-right: 5px;
-    background-size: $size $size;
-    height: $size;
-    width: $size;
-  }
-}