decidim-proposals 0.23.1 → 0.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82abb8e700200d86798c63c09f42604c50e8117ec6f162eac16f93fbbe51d2b4
-  data.tar.gz: 8becaeaae84754886571c87b1f2df2caa01e8dd17b81808aa1af4e2dff9ecaaa
+  metadata.gz: 9bf25b623709eab1b21a1fb192f79de33e0d372384d67435e7e945d0e40fe7b0
+  data.tar.gz: a05a461559454ad127097d7344f5fb8d50e6fc2c9537319e711bb7e09c3f6355
 SHA512:
-  metadata.gz: bc3725296a98abca0ae3b7634813ceb50a28be31045082b7764bb12b39974a5de013e01b86818c648293ca6147ba4a900ea985413a023bc6b73b71ce73ede570
-  data.tar.gz: b586bdd3ebec54dc6f29de58a2bbabc6dbd77209884cdde6fbd3eef3b7e53f282d862536eb84a064e1105fe51cb1e58d2d64e0ce25e2f0f1428b065b22b002bf
+  metadata.gz: e5ea130360aadb726c4a03b283f542bffed6c5b55eb1451115cddd26e07ef4ac85f26ed3c2da83a07a53abf68b4dce404f144614beb6e4074f2ab0d2b8a3230b
+  data.tar.gz: 16db0fb106633338d4253fa0c92cade541a68894c92807d89839004de283e27e41b0d2472dd1cc6e646f41c78b90acf6b06efc4126f46ac59b342561e19ccc79

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

@@ -2,13 +2,21 @@
 
 module Decidim
   module Proposals
-    # A cell to display when a proposal has been published.
+    # A cell to display when actions happen on a proposal.
     class ProposalActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.proposals.last_activity.new_proposal_at_html",
-          link: participatory_space_link
-        )
+        case action
+        when "update"
+          I18n.t(
+            "decidim.proposals.last_activity.proposal_updated_at_html",
+            link: participatory_space_link
+          )
+        else
+          I18n.t(
+            "decidim.proposals.last_activity.new_proposal_at_html",
+            link: participatory_space_link
+          )
+        end
       end
 
       def resource_link_text

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

@@ -50,7 +50,7 @@ module Decidim
 
       def filtered_proposals
         @filtered_proposals ||= if filtered?
-                                  proposals.where("title ILIKE ?", "%#{search_text}%")
+                                  proposals.where("title::text ILIKE ?", "%#{search_text}%")
                                            .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
                                            .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
                                 else

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

@@ -28,6 +28,8 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
+          delete_attachment(form.attachment) if delete_attachment?
+
           if process_attachments?
             @proposal.attachments.destroy_all
 

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

@@ -124,13 +124,13 @@ module Decidim
         def edit
           enforce_permission_to :edit, :proposal, proposal: proposal
           @form = form(Admin::ProposalForm).from_model(proposal)
-          @form.attachment = form(AttachmentForm).from_params({})
         end
 
         def update
           enforce_permission_to :edit, :proposal, proposal: proposal
 
           @form = form(Admin::ProposalForm).from_params(params)
+
           Admin::UpdateProposal.call(@form, @proposal) do
             on(:ok) do |_proposal|
               flash[:notice] = t("proposals.update.success", scope: "decidim")

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

@@ -35,11 +35,13 @@ module Decidim
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
-          @proposals = search
-                       .results
-                       .published
-                       .not_hidden
-                       .includes(:amendable, :category, :component, :resource_permission, :scope)
+          @base_query = search
+                        .results
+                        .published
+                        .not_hidden
+
+          @proposals = @base_query.includes(:amendable, :category, :component, :resource_permission, :scope)
+          @all_geocoded_proposals = @base_query.geocoded
 
           @voted_proposals = if current_user
                                ProposalVote.where(

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

@@ -13,6 +13,19 @@ module Decidim
         validates :title, :body, translatable_presence: true
 
         validate :notify_missing_attachment_if_errored
+
+        def map_model(model)
+          super(model)
+          presenter = ProposalPresenter.new(model)
+
+          self.title = presenter.title(all_locales: title.is_a?(Hash))
+          self.body = presenter.body(all_locales: body.is_a?(Hash))
+          self.attachment = if model.documents.first.present?
+                              { file: model.documents.first.file, title: translated_attribute(model.documents.first.title) }
+                            else
+                              {}
+                            end
+        end
       end
     end
   end

data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb

@@ -18,7 +18,6 @@ module Decidim
         maximum: ->(record) { record.component.settings.proposal_length }
       }
 
-      validate :proposal_length
       validate :body_is_not_bare_template
 
       alias component current_component
@@ -32,13 +31,6 @@ module Decidim
 
       private
 
-      def proposal_length
-        return unless body.presence
-
-        length = current_component.settings.proposal_length
-        errors.add(:body, :too_long, count: length) if body.length > length
-      end
-
       def body_is_not_bare_template
         return if body_template.blank?
 

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

@@ -10,10 +10,14 @@ module Decidim
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
         geocoded_proposals.map do |proposal|
-          proposal.slice(:latitude, :longitude, :address).merge(title: present(proposal).title,
-                                                                body: truncate(present(proposal).body, length: 100),
-                                                                icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
-                                                                link: proposal_path(proposal))
+          proposal
+            .slice(:latitude, :longitude, :address)
+            .merge(
+              title: decidim_html_escape(present(proposal).title),
+              body: html_truncate(decidim_sanitize(present(proposal).body), length: 100),
+              icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+              link: proposal_path(proposal)
+            )
         end
       end
     end

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

@@ -130,7 +130,9 @@ module Decidim
                                                             .where(decidim_author_type: "Decidim::UserBaseEntity")
                                                             .pluck(:decidim_author_id).to_a.compact.uniq
 
-        (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids).flatten.compact.uniq
+        commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(proposals)
+
+        (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids + commentators_ids).flatten.compact.uniq
       end
 
       # Public: Updates the vote count of this proposal.

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
@@ -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/services/decidim/proposals/collaborative_draft_search.rb

@@ -21,7 +21,7 @@ module Decidim
       # translated.
       def search_search_text
         query
-          .where("title ILIKE ?", "%#{search_text}%")
+          .where("title::text ILIKE ?", "%#{search_text}%")
           .or(query.where("body ILIKE ?", "%#{search_text}%"))
       end
 

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

@@ -63,13 +63,15 @@ module Decidim
           "created_at",
           "updated_at",
           "state",
+          "state_published_at",
           "answer",
           "answered_at",
           "decidim_component_id",
           "reference",
-          "proposal_votes_count",
+          "comments_count",
           "endorsements_count",
-          "proposal_notes_count"
+          "proposal_notes_count",
+          "proposal_votes_count"
         ).merge(
           "category" => original_proposal.category
         ).merge(

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/_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/collaborative_drafts/edit.html.erb

@@ -1,10 +1,12 @@
 <% 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>
 

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

@@ -14,10 +14,12 @@
 <% end %>
 
 <div class="row column view-header">
-  <%= link_to collaborative_drafts_path do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+  <div class="m-bottom">
+    <%= link_to collaborative_drafts_path do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
 
   <h2 class="heading2">
     <%= present(@collaborative_draft).title(links: true, html_escape: true) %>

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

@@ -1,10 +1,12 @@
 <% 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>
 

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

@@ -1,7 +1,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <% if component_settings.geocoding_enabled? %>
-  <%= dynamic_map_for proposals_data_for_map(@proposals.select(&:geocoded?)) do %>
+  <%= dynamic_map_for proposals_data_for_map(@all_geocoded_proposals) do %>
     <template id="marker-popup">
       <div class="map-info__content">
         <h3>${title}</h3>

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

@@ -34,10 +34,12 @@ extra_admin_link(
 <%= emendation_announcement_for @proposal %>
 <div class="row column view-header">
 
-  <%= link_to proposals_path(filter_link_params), class: "small hollow" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back_to_list") %>
-  <% end %>
+  <div class="m-bottom">
+    <%= link_to proposals_path(filter_link_params), class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back_to_list") %>
+    <% end %>
+  </div>
 
   <% if @proposal.emendation? %>
     <h3 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h3>

data/config/locales/ar.yml

@@ -578,6 +578,7 @@ ar:
         update:
           error: حدثت مشكلة في حفظ المسودة التعاونية.
           success: تم تحديث المسودة التعاونية بنجاح.
+          title: تحرير المسودة التعاونية
         wizard_aside:
           back: الى الخلف
           info: إنك لعلى خلق <strong>مشروع تعاوني</strong>.

data/config/locales/bg.yml

@@ -229,6 +229,10 @@ bg:
         proposal_published_for_space:
           email_intro: Предложението "%{resource_title}" беше добавено в "%{participatory_space_title}", което следвате.
           email_outro: Получавате това известие, защото следвате "%{participatory_space_title}". Може да прекратите известията чрез предната връзка.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_proposals:
+          proposals: Предложения
     proposals:
       versions:
         collaborative_drafts: