decidim-proposals 0.23.1 → 0.24.0.rc2

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

@@ -57,9 +57,9 @@ module Decidim
           # Only admin users can publish many answers at once
           toggle_allow(user.admin?) if permission_action.subject == :proposals && permission_action.action == :publish_answers
 
-          if permission_action.subject == :participatory_texts && participatory_texts_are_enabled?
+          if permission_action.subject == :participatory_texts && participatory_texts_are_enabled? && permission_action.action == :manage
             # Every user allowed by the space can manage (import, update and publish) participatory texts to proposals
-            allow! if permission_action.action == :manage
+            allow!
           end
 
           permission_action

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

@@ -10,9 +10,10 @@ module Decidim
         return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
-        if permission_action.subject == :proposal
+        case permission_action.subject
+        when :proposal
           apply_proposal_permissions(permission_action)
-        elsif permission_action.subject == :collaborative_draft
+        when :collaborative_draft
           apply_collaborative_draft_permissions(permission_action)
         else
           permission_action

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

@@ -42,8 +42,8 @@ module Decidim
           "activemodel.attributes.proposal"
         end
 
-        def has_diff?
-          action == "answer" || super
+        def diff_actions
+          super + %w(answer)
         end
       end
     end

data/app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb

@@ -38,8 +38,8 @@ module Decidim
           "activemodel.attributes.valuation_assignment.admin_log"
         end
 
-        def has_diff?
-          %w(create delete).include?(action) || super
+        def diff_actions
+          super + %w(create delete)
         end
 
         def i18n_params

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

@@ -38,28 +38,33 @@ module Decidim
       # extras - should include extra hashtags?
       #
       # Returns a String.
-      def title(links: false, extras: true, html_escape: false)
-        text = translated_attribute(proposal.title)
-        text = decidim_html_escape(text) if html_escape
+      def title(links: false, extras: true, html_escape: false, all_locales: false)
+        return unless proposal
 
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        renderer.render(links: links, extras: extras).html_safe
+        handle_locales(proposal.title, all_locales) do |content|
+          content = decidim_html_escape(content) if html_escape
+
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          renderer.render(links: links, extras: extras).html_safe
+        end
       end
 
       def id_and_title(links: false, extras: true, html_escape: false)
         "##{proposal.id} - #{title(links: links, extras: extras, html_escape: html_escape)}"
       end
 
-      def body(links: false, extras: true, strip_tags: false)
-        text = translated_attribute(proposal.body)
+      def body(links: false, extras: true, strip_tags: false, all_locales: false)
+        return unless proposal
 
-        text = strip_tags(sanitize_text(text)) if strip_tags
+        handle_locales(proposal.body, all_locales) do |content|
+          content = strip_tags(sanitize_text(content)) if strip_tags
 
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        text = renderer.render(links: links, extras: extras).html_safe
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          content = renderer.render(links: links, extras: extras).html_safe
 
-        text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
-        text
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
+          content
+        end
       end
 
       # Returns the proposal versions, hiding not published answers
@@ -95,13 +100,13 @@ module Decidim
       private
 
       def sanitize_unordered_lists(text)
-        text.gsub(%r{(?=.*<\/ul>)(?!.*?<li>.*?<\/ol>.*?<\/ul>)<li>}) { |li| li + "• " }
+        text.gsub(%r{(?=.*</ul>)(?!.*?<li>.*?</ol>.*?</ul>)<li>}) { |li| "#{li}• " }
       end
 
       def sanitize_ordered_lists(text)
         i = 0
 
-        text.gsub(%r{(?=.*<\/ol>)(?!.*?<li>.*?<\/ul>.*?<\/ol>)<li>}) do |li|
+        text.gsub(%r{(?=.*</ol>)(?!.*?<li>.*?</ul>.*?</ol>)<li>}) do |li|
           i += 1
 
           li + "#{i}. "
@@ -109,11 +114,11 @@ module Decidim
       end
 
       def add_line_feeds_to_paragraphs(text)
-        text.gsub("</p>") { |p| p + "\n\n" }
+        text.gsub("</p>") { |p| "#{p}\n\n" }
       end
 
       def add_line_feeds_to_list_items(text)
-        text.gsub("</li>") { |li| li + "\n" }
+        text.gsub("</li>") { |li| "#{li}\n" }
       end
 
       # Adds line feeds after the paragraph and list item closing tags.
@@ -130,6 +135,20 @@ module Decidim
       def sanitize_text(text)
         add_line_feeds(sanitize_ordered_lists(sanitize_unordered_lists(text)))
       end
+
+      def handle_locales(content, all_locales, &block)
+        if all_locales
+          content.each_with_object({}) do |(key, value), parsed_content|
+            parsed_content[key] = if key == "machine_translations"
+                                    handle_locales(value, all_locales, &block)
+                                  else
+                                    block.call(value)
+                                  end
+          end
+        else
+          yield(translated_attribute(content))
+        end
+      end
     end
   end
 end

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

@@ -17,8 +17,8 @@ module Decidim
           cumulative_users |= retrieve_drafts_followers.pluck(:decidim_user_id)
 
           quantity_users = []
-          quantity_users |= retrieve_proposals_followers(true).pluck(:decidim_user_id)
-          quantity_users |= retrieve_drafts_followers(true).pluck(:decidim_user_id)
+          quantity_users |= retrieve_proposals_followers(from_start: true).pluck(:decidim_user_id)
+          quantity_users |= retrieve_drafts_followers(from_start: true).pluck(:decidim_user_id)
 
           {
             cumulative_users: cumulative_users.uniq,
@@ -28,7 +28,7 @@ module Decidim
 
         private
 
-        def retrieve_proposals_followers(from_start = false)
+        def retrieve_proposals_followers(from_start: false)
           @proposals_followers ||= Decidim::Follow.where(followable: retrieve_proposals).joins(:user)
                                                   .where("decidim_follows.created_at <= ?", end_time)
 
@@ -37,7 +37,7 @@ module Decidim
           @proposals_followers
         end
 
-        def retrieve_drafts_followers(from_start = false)
+        def retrieve_drafts_followers(from_start: false)
           @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

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

@@ -19,9 +19,9 @@ module Decidim
           cumulative_users |= retrieve_proposals.pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
 
           quantity_users = []
-          quantity_users |= retrieve_votes(true).pluck(:decidim_author_id)
-          quantity_users |= retrieve_endorsements(true).pluck(:decidim_author_id)
-          quantity_users |= retrieve_proposals(true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+          quantity_users |= retrieve_votes(from_start: true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_endorsements(from_start: true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_proposals(from_start: true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
 
           {
             cumulative_users: cumulative_users.uniq,
@@ -31,7 +31,7 @@ module Decidim
 
         private
 
-        def retrieve_proposals(from_start = false)
+        def retrieve_proposals(from_start: false)
           @proposals ||= Decidim::Proposals::Proposal.where(component: @resource).joins(:coauthorships)
                                                      .includes(:votes, :endorsements)
                                                      .where(decidim_coauthorships: {
@@ -49,7 +49,7 @@ module Decidim
           @proposals
         end
 
-        def retrieve_votes(from_start = false)
+        def retrieve_votes(from_start: false)
           @votes ||= Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: retrieve_proposals).joins(:author)
                                                      .where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
 
@@ -58,7 +58,7 @@ module Decidim
           @votes
         end
 
-        def retrieve_endorsements(from_start = false)
+        def retrieve_endorsements(from_start: false)
           @endorsements ||= Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
                                                 .where(resource: retrieve_proposals)
                                                 .where("decidim_endorsements.created_at <= ?", end_time)

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

@@ -42,15 +42,7 @@ module Decidim
       # Returns and Array of two Strings.
       def parse_values(attribute, values)
         values = [amended_previous_value(attribute), values[1]] if proposal&.emendation?
-        if attribute == :body
-          values = values.map do |value|
-            if value.is_a?(Hash)
-              value.values.map { |subvalue| normalize_line_endings(subvalue) }
-            else
-              normalize_line_endings(value)
-            end
-          end
-        end
+        values = values.map { |value| normalize_line_endings(value) } if attribute == :body
         values
       end
 
@@ -66,8 +58,12 @@ module Decidim
       end
 
       # Returns a String with the newline escape sequences normalized.
-      def normalize_line_endings(string)
-        Decidim::ContentParsers::NewlineParser.new(string, context: {}).rewrite
+      def normalize_line_endings(value)
+        if value.is_a?(Hash)
+          value.values.map { |subvalue| normalize_line_endings(subvalue) }
+        else
+          Decidim::ContentParsers::NewlineParser.new(value, context: {}).rewrite
+        end
       end
 
       def proposal

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

@@ -63,6 +63,7 @@ module Decidim
           "created_at",
           "updated_at",
           "state",
+          "state_published_at",
           "answer",
           "answered_at",
           "decidim_component_id",

data/app/validators/proposal_length_validator.rb

@@ -20,7 +20,8 @@ class ProposalLengthValidator < ActiveModel::EachValidator
     if min && min.positive? && value.length < min
       record.errors.add(
         attribute,
-        options[:message] || :too_short
+        options[:message] || :too_short,
+        count: min
       )
     end
   end
@@ -31,7 +32,8 @@ class ProposalLengthValidator < ActiveModel::EachValidator
     if max && max.positive? && value.length > max
       record.errors.add(
         attribute,
-        options[:message] || :too_long
+        options[:message] || :too_long,
+        count: max
       )
     end
   end

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -5,12 +5,19 @@
     <% if component_settings.participatory_texts_enabled? %>
       <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button tiny button--simple" %>
     <% end %>
-    <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
     <% if allowed_to? :export, :proposals %>
       <%= export_dropdown %>
     <% end %>
 
+    <% if allowed_to? :import, :proposals %>
+      <%= import_dropdown do %>
+        <% content_tag :li do %>
+          <% link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+        <% end %>
+      <% end %>
+    <% end %>
+
     <% if allowed_to? :create, :proposal %>
       <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
     <% end %>

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

@@ -5,11 +5,11 @@
 
   <div class="card-section">
     <div class="row column hashtags__container">
-      <%= form.translated :text_field, :title, class: "js-hashtags", value: form_presenter.title(extras: false).strip, hashtaggable: true %>
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </div>
 
     <div class="row column hashtags__container">
-      <%= form.translated :editor, :body, hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+      <%= form.translated :editor, :body, hashtaggable: true %>
     </div>
 
     <% if @form.component_automatic_hashtags.any? %>
@@ -84,6 +84,12 @@
 
             <div class="row column">
               <%= form.upload :file, optional: false %>
+              <% if params[:id].present? %>
+                <% if proposal.documents.present? %>
+                  <%= form.hidden_field :id, value: proposal.documents.first.id %>
+                  <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
+                <% end %>
+              <% end %>
             </div>
           <% end %>
         </fieldset>

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

@@ -16,9 +16,11 @@
       <%= translated_attribute proposal.category.name %>
     <% end %>
   </td>
+
   <%= td_resource_scope_for(proposal.scope) %>
+
   <td>
-    <strong class="<%= proposal_state_css_class proposal.state %>">
+    <strong class="<%= proposal_state_css_class proposal %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
       <%= proposal_complete_state proposal %>
     </strong>
@@ -61,6 +63,8 @@
   <td class="table-list__actions">
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
       <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+    <% else %>
+      <span class="action-space icon"></span>
     <% end %>
 
     <%= icon_with_link_to_proposal(proposal) %>

data/app/views/decidim/proposals/admin/proposals_imports/new.html.erb

@@ -2,7 +2,7 @@
   <% if @form.origin_components.any? %>
     <div class="card">
       <div class="card-divider">
-        <h2 class="card-title"><%= title %></h2>
+        <h2 class="card-title"><%= t(".title") %></h2>
       </div>
 
       <div class="card-section">

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

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>

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

@@ -2,17 +2,12 @@
   <div class="m-bottom">
     <%= link_to :back do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= wizard_aside_back_text("collaborative_draft") %>
+      <%= t("back_from_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     <% end %>
   </div>
   <div class="section">
     <p>
-      <%= wizard_aside_info_text %>
+      <%= t("info", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     </p>
   </div>
-  <div class="show-for-large">
-    <div><%= proposal_wizard_steps_title %></div>
-    <div><%= proposal_wizard_current_step_of(@step) %></div>
-    <%= proposal_wizard_stepper(@step) %>
-  </div>
 </div>

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

@@ -0,0 +1,14 @@
+<% if translated_attribute(component_settings.new_proposal_help_text).present? %>
+  <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
+<% end %>
+
+<% if proposal_wizard_step_help_text?(@step) %>
+  <div class="proposal_wizard_help_text">
+    <% callout_step_help_text_class ||= nil %>
+    <%= cell("decidim/announcement", component_settings.try("proposal_wizard_#{@step}_help_text"), callout_class: callout_step_help_text_class) %>
+  </div>
+<% end %>
+
+<h2 class="section-heading">
+  <%= t(".title") %>
+</h2>

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

@@ -1,19 +1,19 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
 <div class="row columns">
-  <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+  <div class="m-bottom">
+    <%= link_to :back, class: "muted-link" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
   <h2 class="section-heading"><%= t(".title") %></h2>
 </div>
 
 <div class="row">
   <div class="columns large-6 medium-centered">
     <div class="card">
-      <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
-        <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
-      <% end %>
+      <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
 
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>

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

@@ -1,26 +1,18 @@
-<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+<% add_decidim_page_title(t("decidim.proposals.collaborative_drafts.wizard_header.title")) %>
 
 <div class="row">
   <%= render partial: "wizard_aside" %>
 
   <div class="columns large-6">
-    <%= render partial: "decidim/proposals/proposals/wizard_header" %>
+    <%= render partial: "wizard_header" %>
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form, url: compare_collaborative_drafts_path, method: :get) do |form| %>
-          <%= form_required_explanation %>
-
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
-          </div>
+        <%= decidim_form_for(@form) do |form| %>
+          <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="actions">
-            <%= form.submit t("decidim.proposals.collaborative_drafts.new.send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
+            <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
           </div>
         <% end %>
       </div>