decidim-proposals 0.18.1 → 0.19.0

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

@@ -35,6 +35,8 @@ module Decidim
           can_endorse_proposal?
         when :unendorse
           can_unendorse_proposal?
+        when :amend
+          can_create_amendment?
         when :vote
           can_vote_proposal?
         when :unvote
@@ -50,11 +52,13 @@ module Decidim
 
       def voting_enabled?
         return unless current_settings
+
         current_settings.votes_enabled? && !current_settings.votes_blocked?
       end
 
       def vote_limit_enabled?
         return unless component_settings
+
         component_settings.vote_limit.present? && component_settings.vote_limit.positive?
       end
 
@@ -95,6 +99,14 @@ module Decidim
         toggle_allow(is_allowed)
       end
 
+      def can_create_amendment?
+        is_allowed = proposal &&
+                     authorized?(:amend, resource: proposal) &&
+                     current_settings&.amendments_enabled?
+
+        toggle_allow(is_allowed)
+      end
+
       def can_vote_proposal?
         is_allowed = proposal &&
                      authorized?(:vote, resource: proposal) &&
@@ -137,28 +149,33 @@ module Decidim
 
       def can_create_collaborative_draft?
         return toggle_allow(false) unless collaborative_drafts_enabled?
+
         toggle_allow(current_settings&.creation_enabled? && authorized?(:create))
       end
 
       def can_edit_collaborative_draft?
         return toggle_allow(false) unless collaborative_drafts_enabled? && collaborative_draft.open?
+
         toggle_allow(collaborative_draft.editable_by?(user))
       end
 
       def can_publish_collaborative_draft?
         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_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.created_by?(user))
       end
     end

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_state_presenter.rb

@@ -7,6 +7,7 @@ module Decidim
         class ProposalStatePresenter < Decidim::Log::ValueTypes::DefaultPresenter
           def present
             return unless value
+
             h.t(value, scope: "decidim.proposals.admin.proposal_answers.edit", default: value)
           end
         end

data/app/presenters/decidim/proposals/collaborative_draft_presenter.rb

@@ -43,7 +43,7 @@ module Decidim
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         text = renderer.render(links: links, extras: extras).html_safe
 
-        text = Anchored::Linker.auto_link(text, target: "_blank", rel: "noopener") if links
+        text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
         text
       end
     end

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -18,8 +18,10 @@ module Decidim
                       coauthorship = coauthorships.first
                       if coauthorship.user_group
                         Decidim::UserGroupPresenter.new(coauthorship.user_group)
-                      else
+                      elsif coauthorship.author.is_a?(Decidim::User)
                         Decidim::UserPresenter.new(coauthorship.author)
+                      elsif coauthorship.author.is_a?(Decidim::Meeting)
+                        Decidim::MeetingPresenter.new(coauthorship.author)
                       end
                     end
       end
@@ -57,7 +59,7 @@ module Decidim
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         text = renderer.render(links: links, extras: extras).html_safe
 
-        text = Anchored::Linker.auto_link(text, target: "_blank", rel: "noopener") if links
+        text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
         text
       end
     end

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

@@ -14,6 +14,7 @@ module Decidim
           @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
+
             quantity_value = quantity[key] || 0
             category_id, space_type, space_id, proposal_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,

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

@@ -33,6 +33,7 @@ module Decidim
                                                   .where("decidim_follows.created_at <= ?", end_time)
 
           return @proposals_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+
           @proposals_followers
         end
 
@@ -40,6 +41,7 @@ module Decidim
           @drafts_followers ||= Decidim::Follow.where(followable: retrieve_collaborative_drafts).joins(:user)
                                                .where("decidim_follows.created_at <= ?", end_time)
           return @drafts_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+
           @drafts_followers
         end
 

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

@@ -45,6 +45,7 @@ module Decidim
                                                      .except_withdrawn
 
           return @proposals.where("decidim_proposals_proposals.published_at >= ?", start_time) if from_start
+
           @proposals
         end
 
@@ -53,6 +54,7 @@ module Decidim
                                                      .where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
 
           return @votes.where("decidim_proposals_proposal_votes.created_at >= ?", start_time) if from_start
+
           @votes
         end
 
@@ -62,6 +64,7 @@ module Decidim
                                                                    .where(decidim_author_type: "Decidim::UserBaseEntity")
 
           return @endorsements.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time) if from_start
+
           @endorsements
         end
       end

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

@@ -14,6 +14,7 @@ module Decidim
           @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
+
             quantity_value = quantity[key] || 0
             category_id, space_type, space_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,

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

@@ -14,6 +14,7 @@ module Decidim
           @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
+
             quantity_value = quantity[key] || 0
             category_id, space_type, space_id, proposal_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,

data/app/services/decidim/proposals/diff_renderer.rb

@@ -18,6 +18,49 @@ module Decidim
           state: :string
         }
       end
+
+      # Parses the values before parsing the changeset.
+      def parse_changeset(attribute, values, type, diff)
+        values = parse_values(attribute, values)
+
+        diff.update(
+          attribute => {
+            type: type,
+            label: I18n.t(attribute, scope: i18n_scope),
+            old_value: values[0],
+            new_value: values[1]
+          }
+        )
+      end
+
+      # Handles which values to use when diffing emendations and
+      # normalizes line endings of the :body attribute values.
+      # Returns and Array of two Strings.
+      def parse_values(attribute, values)
+        values = [amended_previous_value(attribute), values[1]] if proposal&.emendation?
+        values = values.map { |value| normalize_line_endings(value) } if attribute == :body
+        values
+      end
+
+      # Sets the previous value so the emendation can be compared with the amended proposal.
+      # If the amendment is being evaluated, returns the CURRENT attribute value of the amended proposal;
+      # else, returns the attribute value of amended proposal at the moment of making the amendment.
+      def amended_previous_value(attribute)
+        if proposal.amendment.evaluating?
+          proposal.amendable.attributes[attribute.to_s]
+        else # See Decidim::Amendable::PublishDraft#set_first_emendation_version
+          proposal.versions.first.changeset[attribute.to_s].last
+        end
+      end
+
+      # Returns a String with the newline escape sequences normalized.
+      def normalize_line_endings(string)
+        Decidim::ContentParsers::NewlineParser.new(string, context: {}).rewrite
+      end
+
+      def proposal
+        @proposal ||= Proposal.find_by(id: version.item_id)
+      end
     end
   end
 end

data/app/services/decidim/proposals/proposal_builder.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open-uri"
+
 module Decidim
   module Proposals
     # A factory class to ensure we always create Proposals the same way since it involves some logic.
@@ -90,11 +92,32 @@ module Decidim
                    end
 
         proposal.link_resources(original_proposal, "copied_from_component") unless skip_link
+        copy_attachments(original_proposal, proposal)
+
         proposal
       end
       # rubocop:enable Metrics/ParameterLists
 
       module_function :copy
+
+      def copy_attachments(original_proposal, proposal)
+        original_proposal.attachments.each do |attachment|
+          new_attachment = Decidim::Attachment.new(attachment.attributes.slice("content_type", "description", "file", "file_size", "title", "weight"))
+          new_attachment.attached_to = proposal
+
+          if File.exist?(attachment.file.file.path)
+            new_attachment.file = File.open(attachment.file.file.path)
+          else
+            new_attachment.remote_file_url = attachment.url
+          end
+
+          new_attachment.save!
+        rescue Errno::ENOENT, OpenURI::HTTPError => e
+          Rails.logger.warn("[ERROR] Couldn't copy attachment from proposal #{original_proposal.id} when copying to component due to #{e.message}")
+        end
+      end
+
+      module_function :copy_attachments
     end
   end
 end

data/app/services/decidim/proposals/proposal_search.rb

@@ -10,6 +10,8 @@ module Decidim
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})
+        @component = options[:component]
+        @current_user = options[:current_user]
         super(Proposal.all, options)
       end
 
@@ -86,9 +88,9 @@ module Decidim
         when "proposals"
           query.only_amendables
         when "amendments"
-          query.only_emendations
-        else
-          query
+          query.only_visible_emendations_for(@current_user, @component)
+        else # Assume 'all'
+          query.amendables_and_visible_emendations_for(@current_user, @component)
         end
       end
 

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -69,6 +69,30 @@
       </div>
     <% end %>
 
+    <% if component_settings.attachments_allowed? %>
+      <div class="row column gallery__container">
+        <fieldset>
+          <legend><%= t(".gallery_legend") %></legend>
+
+          <% if @form.photos.any? %>
+            <% @form.photos.each do |photo| %>
+              <div class="callout gallery__item" data-closable>
+                <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+                <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
+                <button class="close-button" aria-label="Close" type="button" data-close>
+                  <span aria-hidden="true">&times;</span>
+                </button>
+              </div>
+            <% end %>
+          <% end %>
+
+          <div class="row column">
+            <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
+          </div>
+        </fieldset>
+      </div>
+    <% end %>
+
     <% if component_settings.attachments_allowed? %>
       <div class="row column">
         <fieldset>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -1,12 +1,12 @@
 <tr data-id="<%= proposal.id %>">
   <td>
-    <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br />
+    <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
   </td>
   <td>
-    <%= proposal.id %><br />
+    <%= proposal.id %><br>
   </td>
   <td>
-    <%= decidim_html_escape(present(proposal).title).html_safe %><br />
+    <%= decidim_html_escape(present(proposal).title).html_safe %><br>
   </td>
   <td>
     <% if proposal.category %>

data/app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb

@@ -13,4 +13,4 @@
     <%= card_for draft, context: { label: true } %>
   <% end %>
 </div>
-<%= decidim_paginate @collaborative_drafts, random_seed: random_seed %>
+<%= decidim_paginate @collaborative_drafts %>

data/app/views/decidim/proposals/collaborative_drafts/show.html.erb

@@ -124,9 +124,6 @@
 <%= attachments_for @collaborative_draft %>
 <%= comments_for @collaborative_draft %>
 
-<%= javascript_include_tag "decidim/proposals/social_share" %>
-<%= stylesheet_link_tag "decidim/proposals/social_share" %>
-
 <%=
   render partial: "decidim/shared/flag_modal", locals: {
     reportable: @collaborative_draft,

data/app/views/decidim/proposals/proposal_endorsements/_identity.html.erb

@@ -1,7 +1,7 @@
 <li class="<%= selected ? "selected" : "" %>" data-method="<%= http_method.to_s.upcase %>" data-url="<%= current_endorsement_url %>">
   <div class="author-data author-data--small">
     <div class="author-data__main">
-      <%== cell("decidim/author", identity).profile %>
+      <%== cell("decidim/author", identity, skip_profile_link: true).profile %>
     </div>
   </div>
 

data/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -12,9 +12,10 @@
     </div>
   </div>
 
-  <% if Decidim::Proposals::Proposal.only_emendations.any? %>
+  <% if @proposals.only_emendations.any? %>
     <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, legend_title: t(".amendment_type") %>
   <% end %>
+
   <% if component_settings.official_proposals_enabled %>
     <%= form.collection_radio_buttons :origin, filter_origin_values, :first, :last, legend_title: t(".origin") %>
   <% end %>

data/app/views/decidim/proposals/proposals/_proposal_preview.html.erb

@@ -7,5 +7,5 @@
 <div class="row column">
   <%= simple_format(present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false) %>
 </div>
-<br />
+<br>
 <%= attachments_for(@proposal) %>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -11,4 +11,4 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>
-<%= decidim_paginate @proposals, random_seed: random_seed %>
+<%= decidim_paginate @proposals %>

data/app/views/decidim/proposals/proposals/index.html.erb

@@ -11,7 +11,7 @@
             <div class="address card__extra">
               <div class="address__icon">{{html icon}}</div>
               <div class="address__details">
-                <span>${address}</span><br />
+                <span>${address}</span><br>
               </div>
             </div>
           </div>

data/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb

@@ -10,7 +10,7 @@
             <% else %>
               <u class="text-uppercase"><%= decidim_html_escape(present(proposal).title).html_safe %></u>
             <% end %>
-            <br />
+            <br>
           <% end %>
         </p>
       </div>

data/app/views/decidim/proposals/proposals/show.html.erb

@@ -23,7 +23,11 @@ edit_link(
 <% end %>
 <%= emendation_announcement_for @proposal %>
 <div class="row column view-header">
-  <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
+  <% if @proposal.emendation? %>
+    <h2 class="heading2"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
+  <% else %>
+    <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
+  <% end %>
   <% unless component_settings.participatory_texts_enabled? %>
     <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>
   <% end %>
@@ -50,7 +54,7 @@ edit_link(
         </div>
       </div>
     <% end %>
-    <% if allowed_to?(:edit, :proposal, proposal: @proposal) %>
+    <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
       <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
     <% else %>
       <%= amend_button_for @proposal %>
@@ -75,7 +79,7 @@ edit_link(
               <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
             <% end %>
             <%= render partial: "endorsements_card_row", locals: { proposal: @proposal } %>
-            <br />
+            <br>
             <%= follow_button_for(@proposal) %>
           </div>
         </div>
@@ -89,12 +93,15 @@ edit_link(
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
     <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
+    <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
-      <% unless @proposal.participatory_text_level == "section" || @proposal.participatory_text_level == "subsection" %>
-        <%= simple_format(present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false) %>
+      <% if @proposal.emendation? %>
+        <%= cell("decidim/diff", @proposal.versions.last) %>
+      <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
+        <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
+        <%= simple_format present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false %>
       <% end %>
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
@@ -138,9 +145,6 @@ edit_link(
 
 <%= comments_for @proposal %>
 
-<%= javascript_include_tag "decidim/proposals/social_share" %>
-<%= stylesheet_link_tag "decidim/proposals/social_share" %>
-
 <%=
   render partial: "decidim/shared/flag_modal", locals: {
     reportable: @proposal,