decidim-proposals 0.31.5 → 0.32.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a367060a3d6445a1e250dc260f3af3a69aa8395b648007e20bb26fe430bc79fb
-  data.tar.gz: 3c8229ee2c9633433589fa41cabd92fdd455ca3cd3e70908e2210afa5d2fa6b0
+  metadata.gz: 5fc06798927baa41252173d448c8d8cd405218e02eae208975061a6b6a736a87
+  data.tar.gz: 021d02221b22c4008ad24667e8f0a1e685aaf90647cdd2dbd1fb3d390c099248
 SHA512:
-  metadata.gz: eebf2257c14db10d384c0d8c578cb0c1e8ab15c37ee297b0cfd2e71fb73b55fb8c278fa1a1286787dfc40ef7739f9704a920333342d3a2ac35d1a6ab6265fbee
-  data.tar.gz: b88016bd527077e1016507fc22236307d473517d4b7da149e16dcbb7d30f2404e68769fc4a9f2a05b06c96edfc870d79aeda51be56c313f551ff1ce325ded4b7
+  metadata.gz: 021c9c0a741e00b52bfed523c93268e8bd620212a90b9eb03d4e796720aecadbe45cf8235dfa8bd1b80f0ceb08ff80c58b9ef4515f92675d5ebea85b7a43f406
+  data.tar.gz: 97027564f5c0183ac1f93614e38212dedb57e7160bd28621e525c86fb81285a8d0894b43e5c728cb2ee2222257d1a736b1dcdee6e2cf0644bd07bac911cabb71

data/README.md

@@ -1,24 +1,14 @@
-# Decidim::Proposals
+# decidim-proposals
 
-The Proposals module adds one of the main components of Decidim: allows users to contribute to a participatory process by creating proposals.
+The Proposals module adds one of the main components of Decidim: allows users to contribute to a participatory space by creating proposals.
 
 ## Usage
 
-Proposals will be available as a Component for a Participatory Process.
+Proposals will be available as a Component for a Participatory Space.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'decidim-proposals'
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this component.
 
 ## Global Search
 

data/app/commands/decidim/proposals/admin/merge_proposals.rb

@@ -7,6 +7,7 @@ module Decidim
       # one component to another.
       class MergeProposals < Decidim::Command
         include ::Decidim::MultipleAttachmentsMethods
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.

data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb

@@ -27,6 +27,7 @@ module Decidim
             transaction do
               increment_score
               notify_followers
+              notify_authors
             end
           end
 
@@ -48,11 +49,22 @@ module Decidim
             event: "decidim.events.proposals.proposal_state_changed",
             event_class: Decidim::Proposals::ProposalStateChangedEvent,
             resource: proposal,
-            affected_users: proposal.notifiable_identities,
             followers: proposal.followers - proposal.notifiable_identities
           )
         end
 
+        def notify_authors
+          return if proposal.state == "not_answered"
+
+          Decidim::EventsManager.publish(
+            event: "decidim.events.proposals.proposal_state_changed_for_authors",
+            event_class: Decidim::Proposals::ProposalStateChangedEvent,
+            resource: proposal,
+            affected_users: proposal.authors,
+            extra: { force_email: true }
+          )
+        end
+
         def increment_score
           if proposal.accepted?
             proposal.coauthorships.find_each do |coauthorship|

data/app/commands/decidim/proposals/admin/update_proposal_taxonomies.rb

@@ -6,6 +6,7 @@ module Decidim
       #  A command with all the business logic when an admin batch updates proposals taxonomies.
       class UpdateProposalTaxonomies < UpdateResourcesTaxonomies
         include TranslatableAttributes
+
         # Public: Initializes the command.
         #
         # taxonomy_ids - the taxonomy ids to update

data/app/commands/decidim/proposals/gallery_methods.rb

@@ -2,8 +2,7 @@
 
 module Decidim
   module Proposals
-    # A module with all the gallery common methods for proposals
-    # and collaborative draft commands.
+    # A module with all the gallery common methods for proposals commands.
     # Allows to create several image attachments at once
     module GalleryMethods
       include ::Decidim::GalleryMethods

data/app/commands/decidim/proposals/unvote_proposal.rb

@@ -16,7 +16,6 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -32,10 +32,6 @@ module Decidim
             collection.with_evaluation_assigned_to(current_user, current_participatory_space)
           end
 
-          def search_field_predicate
-            :id_string_or_title_cont
-          end
-
           def filter_config
             @filter_config ||= Decidim::AdminFilter.new(:proposals).build_for(self)
           end

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -22,9 +22,10 @@ module Decidim
           @possible_orders ||= begin
             possible_orders = %w(random recent)
             possible_orders << "most_voted" if most_voted_order_available?
-            possible_orders << "most_liked" if current_settings.likes_enabled?
-            possible_orders << "most_commented" if component_settings.comments_enabled?
-            possible_orders << "most_followed" << "with_more_authors"
+            possible_orders << "most_liked" if most_liked_order_available?
+            possible_orders << "most_commented" if most_commented_order_available?
+            possible_orders << "most_followed" # always shown, as the author automatically follows their proposals
+            possible_orders << "with_more_authors" if with_more_authors_order_available?
             possible_orders
           end
         end
@@ -52,6 +53,24 @@ module Decidim
           current_settings.votes_enabled? && !current_settings.votes_hidden?
         end
 
+        def with_more_authors_order_available?
+          return @with_more_authors_order_available if defined?(@with_more_authors_order_available)
+
+          @with_more_authors_order_available = Decidim::Proposals::Proposal.with_more_authors_available?(current_component)
+        end
+
+        def most_commented_order_available?
+          return @most_commented_order_available if defined?(@most_commented_order_available)
+
+          @most_commented_order_available = Decidim::Proposals::Proposal.most_commented_available?(current_component)
+        end
+
+        def most_liked_order_available?
+          return @most_liked_order_available if defined?(@most_liked_order_available)
+
+          @most_liked_order_available = Decidim::Proposals::Proposal.most_liked_available?(current_component)
+        end
+
         def order_by_votes?
           most_voted_order_available? && current_settings.votes_blocked?
         end

data/app/controllers/decidim/proposals/admin/evaluation_assignments_controller.rb

@@ -34,12 +34,12 @@ module Decidim
           Admin::UnassignProposalsFromEvaluator.call(@form) do
             on(:ok) do |_proposal|
               flash.keep[:notice] = I18n.t("evaluation_assignments.delete.success", scope: "decidim.proposals.admin")
-              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+              redirect_back_or_to(EngineRouter.admin_proxy(current_component).root_path)
             end
 
             on(:invalid) do
               flash.keep[:alert] = I18n.t("evaluation_assignments.delete.invalid", scope: "decidim.proposals.admin")
-              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+              redirect_back_or_to(EngineRouter.admin_proxy(current_component).root_path)
             end
           end
         end

data/app/controllers/decidim/proposals/admin/participatory_texts_controller.rb

@@ -32,12 +32,12 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_texts.import.invalid", scope: "decidim.proposals.admin")
-              render action: "new_import", status: :unprocessable_entity
+              render action: "new_import", status: :unprocessable_content
             end
 
             on(:invalid_file) do
               flash.now[:alert] = I18n.t("participatory_texts.import.invalid_file", scope: "decidim.proposals.admin")
-              render action: "new_import", status: :unprocessable_entity
+              render action: "new_import", status: :unprocessable_content
             end
           end
         end
@@ -62,7 +62,7 @@ module Decidim
                 failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
                 flash.now[:alert] = alert_msg.join("<br/>").html_safe
                 index
-                render action: "index", status: :unprocessable_entity
+                render action: "index", status: :unprocessable_content
               end
             end
           else
@@ -77,7 +77,7 @@ module Decidim
                 failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
                 flash.now[:alert] = alert_msg.join("<br/>").html_safe
                 index
-                render action: "index", status: :unprocessable_entity
+                render action: "index", status: :unprocessable_content
               end
             end
           end

data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
             on(:invalid) do
               flash.keep[:alert] = I18n.t("proposals.answer.invalid", scope: "decidim.proposals.admin")
-              render template: "decidim/proposals/admin/proposals/show", status: :unprocessable_entity
+              render template: "decidim/proposals/admin/proposals/show", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposal_states_controller.rb

@@ -30,7 +30,7 @@ module Decidim
             on(:invalid) do
               flash.keep[:alert] = I18n.t("proposal_states.create.error", scope: "decidim.proposals.admin")
 
-              render action: :new, status: :unprocessable_entity
+              render action: :new, status: :unprocessable_content
             end
           end
         end
@@ -54,7 +54,7 @@ module Decidim
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposal_states.update.error", scope: "decidim.proposals.admin")
 
-              render action: :edit, status: :unprocessable_entity
+              render action: :edit, status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -44,7 +44,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposals.create.invalid", scope: "decidim.proposals.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
@@ -129,7 +129,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = t("proposals.update.error", scope: "decidim")
-              render :edit, status: :unprocessable_entity
+              render :edit, status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposals_imports_controller.rb

@@ -23,7 +23,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.proposals.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/proposals/admin/proposals_merges_controller.rb

@@ -29,7 +29,7 @@ module Decidim
                 I18n.t("proposals_merges.create.invalid", scope: "decidim.proposals.admin"),
                 @form
               ).message
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end

data/app/controllers/decidim/proposals/invite_coauthors_controller.rb

@@ -53,7 +53,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render json: { message: I18n.t("update.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_entity
+            render json: { message: I18n.t("update.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_content
           end
         end
       end
@@ -68,7 +68,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render json: { message: I18n.t("destroy.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_entity
+            render json: { message: I18n.t("destroy.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -29,7 +29,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: :unprocessable_entity
+            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: :unprocessable_content
           end
         end
       end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -20,7 +20,7 @@ module Decidim
 
       before_action :authenticate_user!, only: [:new, :create]
       before_action :ensure_is_draft, only: [:preview, :publish, :edit_draft, :update_draft, :destroy_draft]
-      before_action :set_proposal, only: [:show, :edit, :update, :withdraw]
+      before_action :proposal, only: [:show, :edit, :update, :withdraw]
       before_action :edit_form, only: [:edit_draft, :edit]
       before_action :set_view_mode, only: [:index]
 
@@ -79,7 +79,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.create.error", scope: "decidim")
-            render :new, status: :unprocessable_entity
+            render :new, status: :unprocessable_content
           end
         end
       end
@@ -101,7 +101,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.publish.error", scope: "decidim")
-            render :edit_draft, status: :unprocessable_entity
+            render :edit_draft, status: :unprocessable_content
           end
         end
       end
@@ -124,7 +124,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.update_draft.error", scope: "decidim")
-            render :edit_draft, status: :unprocessable_entity
+            render :edit_draft, status: :unprocessable_content
           end
         end
       end
@@ -140,7 +140,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.destroy_draft.error", scope: "decidim")
-            render :edit_draft, status: :unprocessable_entity
+            render :edit_draft, status: :unprocessable_content
           end
         end
       end
@@ -161,7 +161,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.update.error", scope: "decidim")
-            render :edit, status: :unprocessable_entity
+            render :edit, status: :unprocessable_content
           end
         end
       end
@@ -216,8 +216,8 @@ module Decidim
         redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path unless @proposal.draft?
       end
 
-      def set_proposal
-        @proposal = Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
+      def proposal
+        @proposal ||= Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
       # Returns true if the proposal is NOT an emendation or the user IS an admin.
@@ -295,6 +295,28 @@ module Decidim
       def default_view_mode
         @default_view_mode ||= current_component.settings.attachments_allowed? ? "grid" : "list"
       end
+
+      def add_parent_breadcrumb_item
+        return {} if proposal.blank?
+
+        object = proposal.emendation? ? proposal.amendable : proposal
+        {
+          label: translated_attribute(object.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(object),
+          active: false
+        }
+      end
+
+      def add_breadcrumb_item
+        return {} if proposal.blank?
+        return {} if proposal.amendable?
+
+        {
+          label: I18n.t("decidim.amendments.name"),
+          url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(proposal),
+          active: false
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/proposals/versions_controller.rb

@@ -2,19 +2,23 @@
 
 module Decidim
   module Proposals
-    # Exposes Proposals versions so users can see how a Proposal/CollaborativeDraft
-    # has been updated through time.
+    # Exposes Proposals versions so users can see how a Proposal has been updated through time.
     class VersionsController < Decidim::Proposals::ApplicationController
       include Decidim::ApplicationHelper
       include Decidim::ResourceVersionsConcern
 
       def versioned_resource
-        @versioned_resource ||=
-          if params[:proposal_id]
-            present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
-          else
-            CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
-          end
+        @versioned_resource ||= Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id])
+      end
+
+      def add_breadcrumb_item
+        return {} if versioned_resource.blank?
+
+        {
+          label: translated_attribute(versioned_resource.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).proposal_path(versioned_resource),
+          active: false
+        }
       end
     end
   end

data/app/events/decidim/proposals/admin/proposal_assigned_to_evaluator_event.rb

@@ -13,7 +13,7 @@ module Decidim
         end
 
         def admin_proposal_info_url
-          send(resource.component.mounted_admin_engine).proposal_url(resource, resource.component.mounted_params)
+          EngineRouter.admin_proxy(resource.component).proposal_url(resource)
         end
 
         private

data/app/events/decidim/proposals/admin/proposal_note_created_event.rb

@@ -14,7 +14,7 @@ module Decidim
         end
 
         def admin_proposal_info_url
-          send(resource.component.mounted_admin_engine).proposal_url(resource, resource.component.mounted_params)
+          EngineRouter.admin_proxy(resource.component).proposal_url(resource)
         end
 
         private

data/app/forms/decidim/proposals/admin/proposals_import_form.rb

@@ -7,6 +7,7 @@ module Decidim
       # from another component.
       class ProposalsImportForm < Decidim::Form
         include TranslatableAttributes
+
         mimic :proposals_import
 
         attribute :origin_component_id, Integer

data/app/forms/decidim/proposals/admin/proposals_merge_form.rb

@@ -8,6 +8,7 @@ module Decidim
       class ProposalsMergeForm < ProposalBaseForm
         include Decidim::HasUploadValidations
         include Decidim::AttachmentAttributes
+
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end

data/app/helpers/decidim/proposals/application_helper.rb

@@ -12,7 +12,6 @@ module Decidim
       include ::Decidim::FollowableHelper
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
-      include CollaborativeDraftHelper
       include ControlVersionHelper
       include Decidim::RichTextEditorHelper
       include Decidim::CheckBoxesTreeHelper
@@ -54,49 +53,19 @@ module Decidim
         end
       end
 
-      # Public: The state of a proposal in a way a human can understand.
-      #
-      # state - The String state of the proposal.
-      #
-      # Returns a String.
-      def humanize_collaborative_draft_state(state)
-        I18n.t("decidim.proposals.collaborative_drafts.states.#{state}", default: :open)
-      end
-
-      # Public: The css class applied based on the collaborative draft state.
-      #
-      # state - The String state of the collaborative draft.
-      #
-      # Returns a String.
-      def collaborative_draft_state_badge_css_class(state)
-        case state
-        when "open"
-          "success"
-        when "withdrawn"
-          "alert"
-        when "published"
-          "secondary"
-        end
-      end
-
       def proposal_limit_enabled?
         proposal_limit.present?
       end
 
-      def not_from_collaborative_draft(proposal)
-        proposal.linked_resources(:proposals, "created_from_collaborative_draft").empty?
-      end
-
       def not_from_participatory_text(proposal)
         proposal.participatory_text_level.nil?
       end
 
       # If the proposal is official or the rich text editor is enabled on the
       # frontend, the proposal body is considered as safe content; that is unless
-      # the proposal comes from a collaborative_draft or a participatory_text.
+      # safe_content_admin? is used and the proposal comes from a participatory text.
       def safe_content?
-        (rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal)) ||
-          safe_content_admin?
+        rich_text_editor_in_public_views? || safe_content_admin?
       end
 
       # For admin entered content, the proposal body can contain certain extra
@@ -203,26 +172,43 @@ module Decidim
         @filter_sections ||= begin
           items = []
           if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled
-            items.append(method: :with_any_state, collection: filter_proposals_state_values, label: t("decidim.proposals.proposals.filters.state"), id: "state")
+            items.append(method: :with_any_state, name: "[with_any_state]", collection: filter_proposals_state_values, label: t("decidim.proposals.proposals.filters.state"),
+                         id: "state")
           end
           current_component.available_taxonomy_filters.each do |taxonomy_filter|
-            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+            items.append(method: :with_any_taxonomies,
+                         name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
                          collection: filter_taxonomy_values_for(taxonomy_filter),
                          label: decidim_sanitize_translated(taxonomy_filter.name),
                          id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
           if component_settings.official_proposals_enabled
-            items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.proposals.proposals.filters.origin"), id: "origin")
+            items.append(method: :with_any_origin,
+                         name: "[with_any_origin]",
+                         collection: filter_origin_values,
+                         label: t("decidim.proposals.proposals.filters.origin"),
+                         id: "origin")
           end
           if current_user
-            items.append(method: :activity, collection: activity_filter_values, label: t("decidim.proposals.proposals.filters.activity"), id: "activity", type: :radio_buttons)
+            items.append(method: :activity,
+                         name: "[activity]",
+                         collection: activity_filter_values,
+                         label: t("decidim.proposals.proposals.filters.activity"),
+                         id: "activity",
+                         type: :radio_buttons)
           end
           if @proposals.only_emendations.any?
-            items.append(method: :type, collection: filter_type_values, label: t("decidim.proposals.proposals.filters.amendment_type"), id: "amendment_type", type: :radio_buttons)
+            items.append(method: :type,
+                         name: "[type]",
+                         collection: filter_type_values,
+                         label: t("decidim.proposals.proposals.filters.amendment_type"),
+                         id: "amendment_type",
+                         type: :radio_buttons)
           end
           if linked_classes_for(Decidim::Proposals::Proposal).any?
             items.append(
               method: :related_to,
+              name: "[related_to]",
               collection: linked_classes_filter_values_for(Decidim::Proposals::Proposal),
               label: t("decidim.proposals.proposals.filters.related_to"),
               id: "related_to",
@@ -235,7 +221,7 @@ module Decidim
       end
 
       def component_name
-        i18n_key = controller_name == "collaborative_drafts" ? "decidim.proposals.collaborative_drafts.name" : "decidim.components.proposals.name"
+        i18n_key = "decidim.components.proposals.name"
         (defined?(current_component) && translated_attribute(current_component&.name).presence) || t(i18n_key)
       end
 

data/app/jobs/decidim/proposals/hide_all_created_by_author_job.rb

@@ -11,9 +11,6 @@ module Decidim
         Decidim::Proposals::Proposal.not_hidden.from_author(resource).find_each do |content|
           hide_content(content, extra[:event_author], extra[:justification])
         end
-        Decidim::Proposals::CollaborativeDraft.not_hidden.from_author(resource).find_each do |content|
-          hide_content(content, extra[:event_author], extra[:justification])
-        end
       end
     end
   end