decidim-proposals 0.23.1 → 0.24.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82abb8e700200d86798c63c09f42604c50e8117ec6f162eac16f93fbbe51d2b4
-  data.tar.gz: 8becaeaae84754886571c87b1f2df2caa01e8dd17b81808aa1af4e2dff9ecaaa
+  metadata.gz: 651e0b6a4c3eb957e436b43b59af16f0f003dafd053982e9ad731007d928b98a
+  data.tar.gz: 9b17adde9c0c8726bdbc8f0b6b9b5783b7f2b16f7fcb89a98a33cc906b55146f
 SHA512:
-  metadata.gz: bc3725296a98abca0ae3b7634813ceb50a28be31045082b7764bb12b39974a5de013e01b86818c648293ca6147ba4a900ea985413a023bc6b73b71ce73ede570
-  data.tar.gz: b586bdd3ebec54dc6f29de58a2bbabc6dbd77209884cdde6fbd3eef3b7e53f282d862536eb84a064e1105fe51cb1e58d2d64e0ce25e2f0f1428b065b22b002bf
+  metadata.gz: ae7a065f2d8b9edd8da8993bc338882d076f63a0236ad6a1594d0a294cb00492a76f368206413771fd560d91f883fc7272150e502abbec6a0e9184590f50ea66
+  data.tar.gz: 0f878229e8d1dd67dfd73af3dfef2b0775a3a4ceb49ef728390b45ec0266d33237228556697bb21e3d63fe23c5a363a5db086b155cf7e07691edbcae6538e173

data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6

@@ -6,13 +6,16 @@ $(() => {
   window.DecidimProposals.bindProposalAddress = () => {
     const $checkbox = $("input:checkbox[name$='[has_address]']");
     const $addressInput = $("#address_input");
+    const $addressInputField = $("input", $addressInput);
 
     if ($checkbox.length > 0) {
       const toggleInput = () => {
         if ($checkbox[0].checked) {
           $addressInput.show();
+          $addressInputField.prop("disabled", false);
         } else {
           $addressInput.hide();
+          $addressInputField.prop("disabled", true);
         }
       }
       toggleInput();
@@ -20,7 +23,7 @@ $(() => {
     }
 
     if ($addressInput.length > 0) {
-      attachGeocoding($("input", $addressInput));
+      attachGeocoding($addressInputField);
     }
   };
 

data/app/assets/stylesheets/decidim/proposals/_proposals.css.scss

@@ -0,0 +1 @@
+@import "proposals/*";

data/app/assets/stylesheets/decidim/proposals/proposals/_preview.css.scss

@@ -0,0 +1,3 @@
+.preview--form__hidden{
+  display: none;
+}

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

@@ -23,13 +23,13 @@ module Decidim
       end
 
       def link_header
-        content_tag :strong, class: "text-large" do
+        tag.strong(class: "text-large") do
           t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end
 
       def link_help_text
-        content_tag :span, class: "text-medium" do
+        tag.span(class: "text-medium") do
           t("final_proposal_help_text", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end
@@ -39,7 +39,7 @@ module Decidim
           collaborative_draft_id: model.id
         )
         link_to @path, class: "text-medium" do
-          content_tag :u do
+          tag.u do
             t("version_history", scope: "decidim.proposals.collaborative_drafts.show")
           end
         end

data/app/cells/decidim/proposals/collaborative_drafts/reported_content/show.erb

@@ -0,0 +1,3 @@
+<blockquote>
+  <p><%= render_value model.body %></p>
+</blockquote>

data/app/cells/decidim/proposals/collaborative_drafts/reported_content_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module CollaborativeDrafts
+      # This cells renders a small preview of the `CollaborativeDraft` that is
+      # used in the moderations panel.
+      class ReportedContentCell < Decidim::ReportedContentCell
+        def show
+          render :show
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals/elements.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 mediumlarge-up-3 large-up-3 card-grid">
+  <% elements.each do |element| %>
+    <%= card_for element, context: { show_space: true } %>
+  <% end %>
+</div>

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals/heading.erb

@@ -0,0 +1 @@
+<h2 class="section-heading"><%= t("decidim.proposals.content_blocks.highlighted_proposals.proposals") %></h2>

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module ContentBlocks
+      class HighlightedProposalsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        def base_relation
+          @base_relation ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn.where(component: published_components)
+        end
+
+        private
+
+        def limit
+          Decidim::Proposals.config.process_group_highlighted_proposals_limit
+        end
+      end
+    end
+  end
+end

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

@@ -60,7 +60,7 @@ module Decidim
       end
 
       def button_cancel
-        content_tag :div, class: "columns medium-6" do
+        tag.div(class: "columns medium-6") do
           button_tag type: "button", class: "clear button secondary expanded", "data-close": "" do
             close_label
           end

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/proposal_m_cell.rb

@@ -8,6 +8,8 @@ module Decidim
     class ProposalMCell < Decidim::CardMCell
       include ProposalCellsHelper
 
+      delegate :current_locale, to: :controller
+
       def badge
         render if has_badge?
       end
@@ -73,7 +75,7 @@ module Decidim
       end
 
       def creation_date_status
-        explanation = content_tag(:strong, t("activemodel.attributes.common.created_at"))
+        explanation = tag.strong(t("activemodel.attributes.common.created_at"))
         "#{explanation}<br>#{l(model.published_at.to_date, format: :decidim_short)}"
       end
 
@@ -87,7 +89,7 @@ module Decidim
 
       def endorsements_count
         with_tooltip t("decidim.endorsable.endorsements") do
-          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
+          "#{icon("bullhorn", class: "icon--small")} #{model.endorsements_count}"
         end
       end
 
@@ -122,6 +124,25 @@ module Decidim
       def resource_image_path
         @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").url : nil
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/proposals/proposal_m"
+        hash << I18n.locale.to_s
+        hash << model.cache_key_with_version
+        hash << model.proposal_votes_count
+        hash << model.endorsements_count
+        hash << Digest::MD5.hexdigest(model.component.settings.to_json)
+        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        if current_user
+          hash << current_user.cache_key_with_version
+          hash << current_user.follows?(model) ? 1 : 0
+        end
+        hash << Digest::MD5.hexdigest(model.followers.to_json)
+        hash << Digest::MD5.hexdigest(model.coauthorships.map(&:cache_key_with_version).to_s)
+
+        hash.join("/")
+      end
     end
   end
 end

data/app/cells/decidim/proposals/reported_content/show.erb

@@ -0,0 +1,4 @@
+<blockquote>
+  <h5><%= render_value model.title %></h5>
+  <p><%= render_value model.body %></p>
+</blockquote>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cells renders a small preview of the `Proposal` that is
+    # used in the moderations panel.
+    class ReportedContentCell < Decidim::ReportedContentCell
+      def show
+        render :show
+      end
+    end
+  end
+end

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/commands/decidim/proposals/hashtags_methods.rb

@@ -14,7 +14,7 @@ module Decidim
       def body_with_hashtags
         @body_with_hashtags ||= begin
           ret = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite.strip
-          ret += "\n" + body_extra_hashtags.strip unless body_extra_hashtags.empty?
+          ret += "\n#{body_extra_hashtags.strip}" unless body_extra_hashtags.empty?
           ret
         end
       end

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")
@@ -165,14 +165,15 @@ module Decidim
         def update_proposals_bulk_response_successful(response, subject)
           return if response[:successful].blank?
 
-          if subject == :category
+          case subject
+          when :category
             t(
               "proposals.update_category.success",
               subject_name: response[:subject_name],
               proposals: response[:successful].to_sentence,
               scope: "decidim.proposals.admin"
             )
-          elsif subject == :scope
+          when :scope
             t(
               "proposals.update_scope.success",
               subject_name: response[:subject_name],
@@ -185,14 +186,15 @@ module Decidim
         def update_proposals_bulk_response_errored(response, subject)
           return if response[:errored].blank?
 
-          if subject == :category
+          case subject
+          when :category
             t(
               "proposals.update_category.invalid",
               subject_name: response[:subject_name],
               proposals: response[:errored].to_sentence,
               scope: "decidim.proposals.admin"
             )
-          elsif subject == :scope
+          when :scope
             t(
               "proposals.update_scope.invalid",
               subject_name: response[:subject_name],

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

@@ -19,7 +19,7 @@ module Decidim
 
       helper_method :geocoded_collaborative_draft, :collaborative_draft
       before_action :collaborative_drafts_enabled?
-      before_action :authenticate_user!, only: [:new, :create, :complete]
+      before_action :authenticate_user!, only: [:new, :create]
       before_action :retrieve_collaborative_draft, only: [:show, :edit, :update, :withdraw, :publish]
 
       def index
@@ -36,7 +36,6 @@ module Decidim
       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({})
         @reject_request_form = form(RejectAccessToCollaborativeDraftForm).from_params({})
@@ -44,42 +43,14 @@ module Decidim
 
       def new
         enforce_permission_to :create, :collaborative_draft
-        @step = :step_1
 
         @form = form(CollaborativeDraftForm).from_params(
           attachment: form(AttachmentForm).from_params({})
         )
       end
 
-      def compare
-        @step = :step_2
-        @similar_collaborative_drafts ||= Decidim::Proposals::SimilarCollaborativeDrafts
-                                          .for(current_component, params[:collaborative_draft])
-                                          .all
-        @form = form(CollaborativeDraftForm).from_params(params)
-
-        if @similar_collaborative_drafts.blank?
-          flash[:notice] = I18n.t("proposals.collaborative_drafts.compare.no_similars_found", scope: "decidim")
-          redirect_to complete_collaborative_drafts_path(collaborative_draft: { title: @form.title, body: @form.body })
-        end
-      end
-
-      def complete
-        enforce_permission_to :create, :collaborative_draft
-        @step = :step_3
-        if params[:collaborative_draft].present?
-          params[:collaborative_draft][:attachment] = form(AttachmentForm).from_params({})
-          @form = form(CollaborativeDraftForm).from_params(params)
-        else
-          @form = form(CollaborativeDraftForm).from_params(
-            attachment: form(AttachmentForm).from_params({})
-          )
-        end
-      end
-
       def create
         enforce_permission_to :create, :collaborative_draft
-        @step = :step_3
         @form = form(CollaborativeDraftForm).from_params(params)
 
         CreateCollaborativeDraft.call(@form, current_user) do

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

@@ -39,7 +39,7 @@ module Decidim
                        .results
                        .published
                        .not_hidden
-                       .includes(:amendable, :category, :component, :resource_permission, :scope)
+                       .includes(:component, :coauthorships)
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -56,8 +56,6 @@ module Decidim
 
       def show
         raise ActionController::RoutingError, "Not Found" if @proposal.blank? || !can_show_proposal?
-
-        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
       def new
@@ -79,7 +77,7 @@ module Decidim
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
 
-            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/compare"
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/compare"
           end
 
           on(:invalid) do
@@ -97,7 +95,7 @@ module Decidim
 
         if @similar_proposals.blank?
           flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
-          redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path + "/complete"
+          redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/complete"
         end
       end
 
@@ -112,6 +110,7 @@ module Decidim
 
       def preview
         @step = :step_4
+        @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
@@ -142,7 +141,7 @@ module Decidim
         UpdateProposal.call(@form, current_user, @proposal) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.update_draft.success", scope: "decidim")
-            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/preview"
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/preview"
           end
 
           on(:invalid) do

data/app/events/decidim/proposals/publish_proposal_event.rb

@@ -18,7 +18,7 @@ module Decidim
       end
 
       def participatory_space_event?
-        extra.dig(:participatory_space)
+        extra[:participatory_space]
       end
     end
   end

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

@@ -26,9 +26,7 @@ module Decidim
       private
 
       def existence_of_requester_in_requesters
-        if collaborative_draft
-          errors.add(:requester_user_id, :invalid) unless collaborative_draft.requesters.exists? requester_user_id
-        end
+        errors.add(:requester_user_id, :invalid) if collaborative_draft && !collaborative_draft.requesters.exists?(requester_user_id)
       end
     end
   end

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

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to create a proposal.
       class ProposalBaseForm < Decidim::Form
         include Decidim::TranslatableAttributes
+        include Decidim::AttachmentAttributes
         include Decidim::ApplicationHelper
 
         mimic :proposal
@@ -20,8 +21,8 @@ module Decidim
         attribute :created_in_meeting, Boolean
         attribute :meeting_id, Integer
         attribute :suggested_hashtags, Array[String]
-        attribute :photos, Array[String]
-        attribute :add_photos, Array
+
+        attachments_attribute :photos
 
         validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }