decidim-proposals 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ad7328b3adf635200a9499b7e4f8105621aa050c352988f44f9e6263827f70
-  data.tar.gz: 381c0320e9e041cd1166a04f6366210abeccd4bcfc07fd4da5369d90202cb31f
+  metadata.gz: 407b694b48340b459b9487e1b7680f71c7f39fd120acb8f953253f0e6f6131b3
+  data.tar.gz: b5af213b89c045c25c5c3e65958938f9ccd61b8dcc2b092a399c34de39290827
 SHA512:
-  metadata.gz: 0d242419f3ce6cda013d468c047dca8beebe336be6be871e458d2a805b0e4d2272a2d621e4f952546d17b5087629e45738048d8c2392cc10f402a95c11d9c001
-  data.tar.gz: be03e252c8ea81291fc8d2931ad348e73d1774e1ccb73550245b4ab8ce1baa8cfa355ee0a15373801df797f6ca70dc38fbe9551cc429c1898056c3b5a65017b5
+  metadata.gz: 0151a8ebc561f6c2b00f05315770f7dd18c80230a5562d8a7ac02d6d6efaaefea1eeb2f40cd335a17e7c1148753ad659050593ebd2db8d16900283096558995e
+  data.tar.gz: 9c07d17862f60743fee23f7662bd7e5d9681c23e7674ba2ef6ce7fb61b035399c5ea58c132a82821702051ad1a7555798f878cb695f976a8ea69c22c00e99187

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

@@ -1,4 +1,6 @@
 $(() => {
+  const { attachGeocoding } = window.Decidim;
+
   window.DecidimProposals = window.DecidimProposals || {};
 
   window.DecidimProposals.bindProposalAddress = () => {
@@ -16,6 +18,10 @@ $(() => {
       toggleInput();
       $checkbox.on("change", toggleInput);
     }
+
+    if ($addressInput.length > 0) {
+      attachGeocoding($("input", $addressInput));
+    }
   };
 
   window.DecidimProposals.bindProposalAddress();

data/app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6

@@ -1,4 +1,6 @@
 $(() => {
+  const { attachGeocoding } = window.Decidim;
+
   const $form = $(".proposal_form_admin");
 
   if ($form.length > 0) {
@@ -19,5 +21,6 @@ $(() => {
     $proposalCreatedInMeeting.on("change", toggleDisabledHiddenFields);
     toggleDisabledHiddenFields();
 
+    attachGeocoding($form.find("#proposal_address"));
   }
 });

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

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path
+        resource_locator(model).path(filter_link_params)
       end
 
       def current_participatory_space

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -16,12 +16,12 @@
         <% if current_settings.comments_blocked? %>
           <%= content_tag :button, class: "column medium-4 button light secondary" do %>
             <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %>
-            <%= model.comments.count %>
+            <%= model.comments_count %>
           <% end %>
           <%= content_tag :button, t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons"), class: "column button hollow secondary button--sc disabled", disabled: true, title: t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
         <% else %>
           <%= link_to resource_comments_path, class: "column medium-4 button light secondary" do %>
-            <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %> <%= model.comments.count %>
+            <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %> <%= model.comments_count %>
           <% end %>
           <%= link_to resource_comments_path, class: "column button hollow secondary button--sc" do %>
             <%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %>

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

@@ -39,7 +39,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path
+        resource_locator(model).path(filter_link_params)
       end
 
       def amend_resource_path

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

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path
+        resource_locator(model).path(filter_link_params)
       end
 
       def current_participatory_space

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

@@ -116,11 +116,11 @@ module Decidim
       end
 
       def has_image?
-        model.attachments.first.present? && model.attachments.first.file.content_type.start_with?("image") && model.component.settings.allow_card_image
+        @has_image ||= model.component.settings.allow_card_image && model.attachments.find_by("content_type like '%image%'").present?
       end
 
       def resource_image_path
-        model.attachments.first.url if has_image?
+        @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").url : nil
       end
     end
   end

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

@@ -60,9 +60,11 @@ module Decidim
         end
 
         def attributes
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
           {
-            title: title_with_hashtags,
-            body: body_with_hashtags,
+            title: parsed_title,
+            body: parsed_body,
             category: form.category,
             scope: form.scope,
             component: form.component,

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

@@ -65,7 +65,12 @@ module Decidim
           body = proposal.body
 
           PaperTrail.request(enabled: false) do
-            proposal.update_columns(title: "", body: "") # rubocop:disable Rails/SkipsModelValidations
+            # rubocop:disable Rails/SkipsModelValidations
+            proposal.update_columns(
+              title: { I18n.locale => "" },
+              body: { I18n.locale => "" }
+            )
+            # rubocop:enable Rails/SkipsModelValidations
           end
 
           [title, body]

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin updates participatory text proposals.
       class UpdateParticipatoryText < Rectify::Command
+        include Decidim::TranslatableAttributes
+
         # Public: Initializes the command.
         #
         # form - A PreviewParticipatoryTextForm form object with the params.
@@ -40,10 +42,16 @@ module Decidim
         def update_contents_and_resort_proposals(form)
           PaperTrail.request(enabled: false) do
             form.proposals.each do |prop_form|
+              add_failure(prop_form) if prop_form.invalid?
+
               proposal = Proposal.where(component: form.current_component).find(prop_form.id)
               proposal.set_list_position(prop_form.position) if proposal.position != prop_form.position
-              proposal.title = prop_form.title
-              proposal.body = prop_form.body if proposal.participatory_text_level == ParticipatoryTextSection::LEVELS[:article]
+              proposal.title = { I18n.locale => translated_attribute(prop_form.title) }
+              proposal.body = if proposal.participatory_text_level == ParticipatoryTextSection::LEVELS[:article]
+                                { I18n.locale => translated_attribute(prop_form.body) }
+                              else
+                                { I18n.locale => "" }
+                              end
 
               add_failure(proposal) unless proposal.save
             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
 
@@ -56,11 +58,13 @@ module Decidim
         attr_reader :form, :proposal, :attachment, :gallery
 
         def update_proposal
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
           Decidim.traceability.update!(
             proposal,
             form.current_user,
-            title: title_with_hashtags,
-            body: body_with_hashtags,
+            title: parsed_title,
+            body: parsed_body,
             category: form.category,
             scope: form.scope,
             address: form.address,

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

@@ -57,8 +57,12 @@ module Decidim
             visibility: "public-only"
           ) do
             proposal = Proposal.new(
-              title: title_with_hashtags,
-              body: body_with_hashtags,
+              title: {
+                I18n.locale => title_with_hashtags
+              },
+              body: {
+                I18n.locale => body_with_hashtags
+              },
               component: form.component
             )
             proposal.add_coauthor(@current_user, user_group: user_group)

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

@@ -59,8 +59,8 @@ module Decidim
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.title, current_organization: @collaborative_draft.organization).rewrite
         parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, @collaborative_draft.body, current_organization: @collaborative_draft.organization).rewrite
 
-        fields[:title] = parsed_title
-        fields[:body] = parsed_body
+        fields[:title] = { I18n.locale => parsed_title }
+        fields[:body] = { I18n.locale => parsed_body }
         fields[:component] = @collaborative_draft.component
         fields[:scope] = @collaborative_draft.scope
         fields[:address] = @collaborative_draft.address

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

@@ -4,7 +4,8 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user updates a proposal.
     class UpdateProposal < Rectify::Command
-      include ::Decidim::AttachmentMethods
+      include ::Decidim::MultipleAttachmentsMethods
+      include GalleryMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -26,15 +27,18 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if form.invalid?
-        return broadcast(:invalid) unless proposal.editable_by?(current_user)
-        return broadcast(:invalid) if proposal_limit_reached?
+        return broadcast(:invalid) if invalid?
 
         if process_attachments?
           @proposal.attachments.destroy_all
 
-          build_attachment
-          return broadcast(:invalid) if attachment_invalid?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        if process_gallery?
+          build_gallery
+          return broadcast(:invalid) if gallery_invalid?
         end
 
         transaction do
@@ -43,7 +47,11 @@ module Decidim
           else
             update_proposal
           end
-          create_attachment if process_attachments?
+          create_gallery if process_gallery?
+          create_attachments if process_attachments?
+
+          photo_cleanup!
+          document_cleanup!
         end
 
         broadcast(:ok, proposal)
@@ -53,6 +61,10 @@ module Decidim
 
       attr_reader :form, :proposal, :current_user, :attachment
 
+      def invalid?
+        form.invalid? || !proposal.editable_by?(current_user) || proposal_limit_reached?
+      end
+
       # Prevent PaperTrail from creating an additional version
       # in the proposal multi-step creation process (step 3: complete)
       #
@@ -79,8 +91,12 @@ module Decidim
 
       def attributes
         {
-          title: title_with_hashtags,
-          body: body_with_hashtags,
+          title: {
+            I18n.locale => title_with_hashtags
+          },
+          body: {
+            I18n.locale => body_with_hashtags
+          },
           category: form.category,
           scope: form.scope,
           address: form.address,

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

@@ -21,14 +21,14 @@ module Decidim
 
         def new
           enforce_permission_to :create, :proposal
-          @form = form(Admin::ProposalForm).from_params(
+          @form = form(Decidim::Proposals::Admin::ProposalForm).from_params(
             attachment: form(AttachmentForm).from_params({})
           )
         end
 
         def create
           enforce_permission_to :create, :proposal
-          @form = form(Admin::ProposalForm).from_params(params)
+          @form = form(Decidim::Proposals::Admin::ProposalForm).from_params(params)
 
           Admin::CreateProposal.call(@form) do
             on(:ok) do
@@ -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/collaborative_drafts_controller.rb

@@ -10,6 +10,7 @@ module Decidim
 
       include Decidim::ApplicationHelper
       include FormFactory
+      include Flaggable
       include FilterResource
       include CollaborativeOrderable
       include Paginable
@@ -183,16 +184,6 @@ module Decidim
 
         ["without"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
       end
-
-      def default_filter_scope_params
-        return unless current_component.participatory_space.scopes.any?
-
-        if current_component.participatory_space.scope
-          [current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
-        else
-          ["global"] + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
-        end
-      end
     end
   end
 end

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

@@ -8,6 +8,8 @@ module Decidim
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
       include Decidim::ApplicationHelper
+      include Flaggable
+      include Withdrawable
       include FormFactory
       include FilterResource
       include Decidim::Proposals::Orderable
@@ -214,7 +216,7 @@ module Decidim
           origin: default_filter_origin_params,
           activity: "all",
           category_id: default_filter_category_params,
-          state: %w(accepted evaluating not_answered),
+          state: %w(accepted evaluating state_not_published),
           scope_id: default_filter_scope_params,
           related_to: "",
           type: "all"
@@ -228,22 +230,6 @@ module Decidim
         filter_origin_params
       end
 
-      def default_filter_category_params
-        return "all" unless current_component.participatory_space.categories.any?
-
-        ["all"] + current_component.participatory_space.categories.pluck(:id).map(&:to_s)
-      end
-
-      def default_filter_scope_params
-        return "all" unless current_component.participatory_space.scopes.any?
-
-        if current_component.participatory_space.scope
-          ["all", current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
-        else
-          %w(all global) + current_component.participatory_space.scopes.pluck(:id).map(&:to_s)
-        end
-      end
-
       def proposal_draft
         Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
                 .where(component: current_component).find_by(published_at: nil)

data/app/controllers/decidim/proposals/{proposal_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Proposals
-    class ProposalWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Proposals::ApplicationHelper
 
       private
@@ -12,7 +12,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= proposal_proposal_widget_url(model)
+        @iframe_url ||= proposal_widget_url(model)
       end
     end
   end

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

@@ -8,6 +8,8 @@ module Decidim
       class ImportParticipatoryTextForm < Decidim::Form
         include TranslatableAttributes
 
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.assemblies.admin.new_import.accepted_types when modifying this hash
         ACCEPTED_MIME_TYPES = Decidim::Proposals::DocToMarkdown::ACCEPTED_MIME_TYPES
 
         translatable_attribute :title, String
@@ -33,7 +35,7 @@ module Decidim
 
         # Return ACCEPTED_MIME_TYPES plus `text/plain` for better markdown support
         def valid_mime_types
-          ACCEPTED_MIME_TYPES.values + [Decidim::Proposals::DocToMarkdown::TEXT_PLAIN_MIME_TYPE]
+          ACCEPTED_MIME_TYPES.values + [Decidim::Proposals::DocToMarkdown::TEXT_PLAIN_MIME_TYPE] + ["application/octet-stream"]
         end
 
         def document_type

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

@@ -6,7 +6,14 @@ module Decidim
       # A form object to be used when admin users want to create a proposal
       # through the participatory texts.
       class ParticipatoryTextProposalForm < Admin::ProposalBaseForm
-        validates :title, length: { maximum: 150 }
+        attribute :title, String
+        attribute :body, String
+        validates :title, length: { maximum: 150 }, presence: true
+
+        def map_model(model)
+          self.title = translated_attribute(model.title)
+          self.body = translated_attribute(model.body)
+        end
       end
     end
   end

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

@@ -5,11 +5,11 @@ module Decidim
     module Admin
       # A form object to be used when admin users want to create a proposal.
       class ProposalBaseForm < Decidim::Form
+        include Decidim::TranslatableAttributes
         include Decidim::ApplicationHelper
+
         mimic :proposal
 
-        attribute :title, String
-        attribute :body, String
         attribute :address, String
         attribute :latitude, Float
         attribute :longitude, Float
@@ -23,25 +23,24 @@ module Decidim
         attribute :photos, Array[String]
         attribute :add_photos, Array
 
-        validates :title, :body, presence: true
-        validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
+        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+        validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
         validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
 
-        validate :scope_belongs_to_participatory_space_scope
-
         validate :notify_missing_attachment_if_errored
 
         delegate :categories, to: :current_component
 
         def map_model(model)
+          body = translated_attribute(model.body)
+          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
+
           return unless model.categorization
 
           self.category_id = model.categorization.decidim_category_id
           self.scope_id = model.decidim_scope_id
-
-          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
         end
 
         alias component current_component
@@ -57,7 +56,7 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @scope_id ? current_participatory_space.scopes.find_by(id: @scope_id) : current_participatory_space.scope
+          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
         end
 
         # Scope identifier
@@ -67,6 +66,18 @@ module Decidim
           @scope_id || scope&.id
         end
 
+        def geocoding_enabled?
+          Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
+        end
+
+        def has_address?
+          geocoding_enabled? && address.present?
+        end
+
+        def geocoded?
+          latitude.present? && longitude.present?
+        end
+
         # Finds the Meetings of the current participatory space
         def meetings
           @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
@@ -107,10 +118,6 @@ module Decidim
 
         private
 
-        def scope_belongs_to_participatory_space_scope
-          errors.add(:scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
-        end
-
         # This method will add an error to the `attachment` field only if there's
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of