decidim-proposals 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f545c292413c69159509938ffa3e0a7a442eaec96770e465b405d709ab0db976
-  data.tar.gz: 90b940f6ce3c968772548d40a04a7c47d7491c340c2a407b78a6013ccdf903c8
+  metadata.gz: 8bd0f06eca6fadd85f7cff679eed7d31d1350394010f46de1033cc1ce34f3566
+  data.tar.gz: da5186ec1edfb655823e1b5802976d5c753471c6b4f95102729c6e1cabaf0566
 SHA512:
-  metadata.gz: e12c387014c567aee0ca73e133357c74621e49dcd49b305ecda4bac2e231e215273d15b30a7d3e0e61772ba6dea2163b3baaf459781aa4a595ba100dcefcf086
-  data.tar.gz: 7dde2bc4a1920813acf8fee2bde644f1d7b80b58c056bab12f720ff2df246e376b401e83418d6a51475ba4190e1147f3beadb651a6be12bf90216fc38e5b5c3c
+  metadata.gz: ae4c19035219cd815b79c31253766c95ee56e549b73b15c91953beb36967c582383692a60330bdc6766d0e223994e55923d6fc05a7dbd6359184cb660f2f66f2
+  data.tar.gz: 474931fce6b3ba9e3f6261fc4f7f587e0ee81662a929b8483f8ce96c4116a69fbca9b2cf295e5a9c161b3f9a2be17502b876cf649e72c436ab3e98077c838b01

data/app/assets/documents/decidim/proposals/participatory_texts/participatory_text.md

@@ -0,0 +1,52 @@
+# Section title 1: grouping content
+
+Participatory texts relay on the parsing of Markdown texts to produce a structured document.
+
+Participatory texts are divided into 3 types of blocks:
+- Section: produced by main headers (paragraphs starting with "# ")
+- Subsection: produced by secondary headers (paragraphs starting more than one "#") until 6 levels.
+- Article: produced by paragraphs and lists.
+
+## Subsection title 1.1
+Parsing of Markdown is strict.
+This means that, for paragraphs and lists, all blocks should be separated by a blank line between them.
+The first, second and this third paragraphs, for example, will be grouped into a single participatory text article.
+
+This paragraph instead, will produce a single participatory text article.
+
+This paragraph also, will produce a third participatory text article.
+
+## Subsection title 1.2
+
+Inside a paragraph list or a list, **bold text** is supported, *italics text* is supported, __underlined text__ is supported.
+As explained [here](https://daringfireball.net/projects/markdown/syntax#em) Markdown treats asterisks (\*) and underscores (\_) as indicators of emphasis. Text wrapped with one \* or \_ will be wrapped with an HTML <em> tag; double \*’s or \_’s will be wrapped with an HTML &lt;strong> tag. E.g., this input:
+- *single asterisks*
+- _single underscores_
+- **double asterisks**
+- __double underscores__
+
+You can use the following reference when writing your documents: [https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
+
+# Section title 2: lists
+
+Lists will be parsed as one block:
+
+- consensus by simple majority: when a, b, and c appear in the creation.
+- consensus by enhanced majority: when a, b, c and also d appear in the creation.
+- consensus by absolute majority: when x, y and z appear in the creation.
+- consensus by imposing whatever the organization wants: to be used at will.
+- consensus by ignoring whatever resulted from the previous consensus: to be used when organization don't like the results of another consensus system.
+
+Ordered lists reset numberings to the correct order (1,2,3,4,5 in this case):
+
+1. one
+2. two
+3. three
+1. four
+1. five
+
+# Section title 3: images and links
+
+A link to Decidim's web site uses [this format](https://decidim.org).
+
+![Important image for Decidim](https://meta.decidim.org/assets/decidim/decidim-logo-1f39092fb3e41d23936dc8aeadd054e2119807dccf3c395de88637e4187f0a3f.svg)

data/app/cells/decidim/proposals/collaborative_draft_cell.rb

@@ -17,10 +17,6 @@ module Decidim
 
       private
 
-      def current_user
-        context[:current_user]
-      end
-
       def card_size
         "decidim/proposals/collaborative_draft_m"
       end

data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb

@@ -12,8 +12,6 @@ module Decidim
       include Messaging::ConversationHelper
       include Decidim::SanitizeHelper
 
-      delegate :current_organization, to: :controller
-
       def show
         render
       end
@@ -35,10 +33,6 @@ module Decidim
         decidim_sanitize(strip_links(formatted))
       end
 
-      def current_user
-        context[:current_user]
-      end
-
       def resource_path
         resource_locator(model).path
       end

data/app/cells/decidim/proposals/proposal_cell.rb

@@ -17,10 +17,6 @@ module Decidim
 
       private
 
-      def current_user
-        context[:current_user]
-      end
-
       def card_size
         "decidim/proposals/proposal_m"
       end

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -50,7 +50,7 @@ module Decidim
 
       def statuses
         return [:endorsements_count, :comments_count] if model.draft?
-        return [:creation_date, :endorsements_count, :comments_count] unless has_link_to_resource?
+        return [:creation_date, :endorsements_count, :comments_count] if !has_link_to_resource? || !can_be_followed?
         [:creation_date, :follow, :endorsements_count, :comments_count]
       end
 
@@ -87,6 +87,10 @@ module Decidim
           t("decidim.proposals.proposals.votes_count.need_more_votes")
         end
       end
+
+      def can_be_followed?
+        !model.withdrawn?
+      end
     end
   end
 end

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

@@ -35,7 +35,7 @@ module Decidim
 
             Decidim::Proposals::ProposalBuilder.copy(
               original_proposal,
-              author: form.current_organization,
+              author: proposal_author,
               action_user: form.current_user,
               extra_attributes: {
                 "component" => target_component
@@ -74,6 +74,10 @@ module Decidim
             proposal.component == target_component
           end
         end
+
+        def proposal_author
+          form.keep_authors ? nil : @form.current_organization
+        end
       end
     end
   end

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

@@ -26,8 +26,10 @@ module Decidim
         return broadcast(:invalid) unless vote.valid?
 
         ActiveRecord::Base.transaction do
-          vote.save!
-          update_temporary_votes
+          @proposal.with_lock do
+            vote.save!
+            update_temporary_votes
+          end
         end
 
         Decidim::Gamification.increment_score(@current_user, :proposal_votes)

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

@@ -16,11 +16,11 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :invalid if the proposal already has supports or does not belong to current user.
+      # - :has_supports if the proposal already has supports or does not belong to current user.
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if @proposal.votes.any?
+        return broadcast(:has_supports) if @proposal.votes.any?
 
         transaction do
           change_proposal_state_to_withdrawn

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

@@ -27,7 +27,7 @@ module Decidim
           Admin::ImportParticipatoryText.call(@import) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_texts.import.success", scope: "decidim.proposals.admin")
-              redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
+              redirect_to EngineRouter.admin_proxy(current_component).participatory_texts_path
             end
 
             on(:invalid) do
@@ -49,7 +49,7 @@ module Decidim
             UpdateParticipatoryText.call(@preview_form) do
               on(:ok) do
                 flash[:notice] = I18n.t("participatory_texts.update.success", scope: "decidim.proposals.admin")
-                redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
+                redirect_to EngineRouter.admin_proxy(current_component).participatory_texts_path
               end
 
               on(:invalid) do |failures|
@@ -85,7 +85,7 @@ module Decidim
           DiscardParticipatoryText.call(current_component) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_texts.discard.success", scope: "decidim.proposals.admin")
-              redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
+              redirect_to EngineRouter.admin_proxy(current_component).participatory_texts_path
             end
           end
         end

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

@@ -24,6 +24,7 @@ module Decidim
       def index
         @collaborative_drafts = search
                                 .results
+                                .not_hidden
                                 .includes(:category)
                                 .includes(:scope)
 
@@ -32,6 +33,7 @@ module Decidim
       end
 
       def show
+        raise ActionController::RoutingError, "Not Found" unless retrieve_collaborative_draft
         @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
         @request_access_form = form(RequestAccessToCollaborativeDraftForm).from_params({})
         @accept_request_form = form(AcceptAccessToCollaborativeDraftForm).from_params({})
@@ -96,6 +98,7 @@ module Decidim
         enforce_permission_to :edit, :collaborative_draft, collaborative_draft: @collaborative_draft
 
         @form = form(CollaborativeDraftForm).from_model(@collaborative_draft)
+        @form.attachment = form(AttachmentForm).from_model(@collaborative_draft.attachments.first)
       end
 
       def update
@@ -153,7 +156,7 @@ module Decidim
       end
 
       def retrieve_collaborative_draft
-        @collaborative_draft = CollaborativeDraft.where(component: current_component).find(params[:id])
+        @collaborative_draft = CollaborativeDraft.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
       def geocoded_collaborative_draft

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

@@ -53,6 +53,7 @@ module Decidim
       end
 
       def show
+        raise ActionController::RoutingError, "Not Found" unless set_proposal
         @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
@@ -204,8 +205,8 @@ module Decidim
               flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
               redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
             end
-            on(:invalid) do
-              flash[:alert] = I18n.t("proposals.update.error", scope: "decidim")
+            on(:has_supports) do
+              flash[:alert] = I18n.t("proposals.withdraw.errors.has_supports", scope: "decidim")
               redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
             end
           end
@@ -241,7 +242,7 @@ module Decidim
       end
 
       def set_proposal
-        @proposal = Proposal.published.not_hidden.where(component: current_component).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
       def form_proposal_params

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

@@ -8,11 +8,14 @@ module Decidim
       class ImportParticipatoryTextForm < Decidim::Form
         include TranslatableAttributes
 
+        ACCEPTED_MIME_TYPES = Decidim::Proposals::DocToMarkdown::ACCEPTED_MIME_TYPES
+
         translatable_attribute :title, String
         translatable_attribute :description, String
         attribute :document
 
         validates :title, translatable_presence: true
+        validate :accepted_mime_type
 
         def default_locale
           current_participatory_space.organization.default_locale
@@ -25,6 +28,17 @@ module Decidim
         def document_type
           document.content_type
         end
+
+        def accepted_mime_type
+          accepted_mime_types = ACCEPTED_MIME_TYPES.values + [Decidim::Proposals::DocToMarkdown::TEXT_PLAIN_MIME_TYPE]
+          return if accepted_mime_types.include?(document_type)
+
+          errors.add(:document,
+                     I18n.t("activemodel.errors.models.participatory_text.attributes.document.invalid_document_type",
+                            valid_mime_types: ACCEPTED_MIME_TYPES.keys.map do |m|
+                              I18n.t("decidim.proposals.admin.participatory_texts.new_import.accepted_mime_types.#{m}")
+                            end.join(", ")))
+        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Decidim
       # A form object to be used when admin users want to review a collection of proposals
       # from a participatory text.
       class PreviewParticipatoryTextForm < Decidim::Form
-        attribute :proposals, Array[ProposalForm]
+        attribute :proposals, Array[Decidim::Proposals::Admin::ProposalForm]
 
         def from_models(proposals)
           self.proposals = proposals.collect do |proposal|

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

@@ -10,6 +10,7 @@ module Decidim
 
         attribute :origin_component_id, Integer
         attribute :import_proposals, Boolean
+        attribute :keep_authors, Boolean
         attribute :states, Array
 
         validates :origin_component_id, :origin_component, :states, :current_component, presence: true

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

@@ -21,6 +21,20 @@ module Decidim
           translated_attribute(participatory_text.title)
         end
       end
+
+      # Public: A formatted collection of mime_type to be used
+      # in forms.
+      def mime_types_with_document_examples
+        links = ""
+        accepted_mime_types = Decidim::Proposals::DocToMarkdown::ACCEPTED_MIME_TYPES.keys
+        accepted_mime_types.each_with_index do |mime_type, index|
+          links += link_to t(".accepted_mime_types.#{mime_type}"),
+                           asset_path("decidim/proposals/participatory_texts/participatory_text.#{mime_type}"),
+                           download: "participatory_text.#{mime_type}"
+          links += ", " unless accepted_mime_types.length == index + 1
+        end
+        links
+      end
     end
   end
 end

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

@@ -132,6 +132,19 @@ module Decidim
         end
       end
 
+      # Renders the back link except for step_2: compare
+      def proposal_wizard_aside_link_to_back(step)
+        url = case step
+              when :step_1
+                proposals_path
+              when :step_3
+                compare_proposal_path
+              when :step_4
+                edit_draft_proposal_path
+              end
+        url
+      end
+
       def wizard_aside_back_text
         case type_of
         when :collaborative_drafts

data/app/models/decidim/proposals/collaborative_draft.rb

@@ -52,6 +52,11 @@ module Decidim
       def published?
         state == "published"
       end
+
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
+      end
     end
   end
 end

data/app/permissions/decidim/proposals/permissions.rb

@@ -122,6 +122,8 @@ module Decidim
           can_publish_collaborative_draft?
         when :request_access
           can_request_access_collaborative_draft?
+        when :react_to_request_access
+          can_react_to_request_access_collaborative_draft?
         end
       end
 
@@ -129,23 +131,35 @@ module Decidim
         @collaborative_draft ||= context.fetch(:collaborative_draft, nil)
       end
 
+      def collaborative_drafts_enabled?
+        component_settings.collaborative_drafts_enabled
+      end
+
       def can_create_collaborative_draft?
-        toggle_allow(authorized?(:create) && current_settings&.creation_enabled? && component_settings&.collaborative_drafts_enabled?)
+        return toggle_allow(false) unless collaborative_drafts_enabled?
+        toggle_allow(current_settings&.creation_enabled? && authorized?(:create))
       end
 
       def can_edit_collaborative_draft?
-        toggle_allow(collaborative_draft.open? && collaborative_draft.editable_by?(user) && component_settings&.collaborative_drafts_enabled?)
+        return toggle_allow(false) unless collaborative_drafts_enabled? && collaborative_draft.open?
+        toggle_allow(collaborative_draft.editable_by?(user))
       end
 
       def can_publish_collaborative_draft?
-        toggle_allow(collaborative_draft.open? && collaborative_draft.editable_by?(user) && component_settings&.collaborative_drafts_enabled?)
+        return toggle_allow(false) unless collaborative_drafts_enabled? && collaborative_draft.open?
+        toggle_allow(collaborative_draft.created_by?(user))
       end
 
       def can_request_access_collaborative_draft?
-        return toggle_allow(false) unless collaborative_draft.open? && component_settings&.collaborative_drafts_enabled?
-        return toggle_allow(false) if collaborative_draft.editable_by?(user)
+        return toggle_allow(false) unless collaborative_drafts_enabled? && collaborative_draft.open?
+        return toggle_allow(false) if collaborative_draft.requesters.include?(user)
+        toggle_allow(!collaborative_draft.editable_by?(user))
+      end
+
+      def can_react_to_request_access_collaborative_draft?
+        return toggle_allow(false) unless collaborative_drafts_enabled? && collaborative_draft.open?
         return toggle_allow(false) if collaborative_draft.requesters.include? user
-        toggle_allow(collaborative_draft && !collaborative_draft.editable_by?(user))
+        toggle_allow(collaborative_draft.created_by?(user))
       end
     end
   end

data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb

@@ -19,10 +19,14 @@ module Decidim
           components = Decidim::Component.where(participatory_space: spaces).published
           @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
                                                .left_outer_joins(:category)
-          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).accepted
+          @query = @query.where("decidim_proposals_proposals.created_at <= ?", end_time).accepted
           @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)
           @query
         end
+
+        def quantity
+          @quantity ||= query.where("decidim_proposals_proposals.created_at >= ?", start_time).count
+        end
       end
     end
   end

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -32,12 +32,12 @@ module Decidim
           return @query if @query
 
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
-            manifest.participatory_spaces.call(@organization).public_spaces
+            manifest.participatory_spaces.call(@organization)
           end
           components = Decidim::Component.where(participatory_space: spaces).published
           @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
                                                .left_outer_joins(:category)
-          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn
+          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn.not_hidden
           @query = @query.group("decidim_categorizations.decidim_category_id",
                                 :participatory_space_type,
                                 :participatory_space_id)