decidim-proposals 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306966eaa2bcf8c8ffc812a513e1b388be7f32f436ad0a227259ca84bffc84aa
-  data.tar.gz: 91791cb5717209c350d5ccd74a2d7bb49e5fe02c7e23d1ffde5ddfcc5eea0ca9
+  metadata.gz: 0e4a0b1c5edf206b2bf649405971a154486744d8946368b0454eca7936d51c47
+  data.tar.gz: 89554df3c8b7adcc5a3d9f694f5f08fbe59a6bd3a1e646d314ffc3b796425e46
 SHA512:
-  metadata.gz: 576553bcf02a966a59848742b93262a0cbbb6a7e25eaa1c168b074d3341545ac9c3165a22b929b006fa906a2b433f9c4396fd51d9814e72506a02f75e623a462
-  data.tar.gz: 25240f1221131cfea87c90e6bada749cdb5fd52cf25d2ba936977fa7d142f2ae25e23b1e9955086a02e9178987fc7a40d26e7855c096c05e71b2c504f0e4e9e9
+  metadata.gz: cea6a62ae70be12318f9d46209add1cace49be33745d7cefedd8eec3de5a8b319a759839c24a950c8bc6c814c21ce6eb8afebcbbac1c41e464c7e78989433d80
+  data.tar.gz: d90297aa8f6a80d1314d692b087a3fe5a1f8d1fea071762610eceb03661d346d1654bc62be2cf1f2c9181ba38c49103ef0c862c0210daec0d5b7e92516597175

data/app/assets/config/decidim_proposals_manifest.js

@@ -1,4 +1,3 @@
-//= link decidim/proposals/social_share.js
 //= link decidim/proposals/add_proposal.js
 //= link decidim/proposals/admin/proposals_form.js
 //= link_tree ../images/decidim

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

@@ -20,4 +20,9 @@ $(() => {
     toggleDisabledHiddenFields();
 
   }
+
+  $(document).on("closed.zf.callout", (event) => {
+    $(event.target).remove();
+  });
+
 });

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

@@ -32,6 +32,7 @@ module Decidim
 
       def badge_classes
         return super unless options[:full_badge]
+
         state_classes.concat(["label", "collaborative-draft-status"]).join(" ")
       end
 

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

@@ -14,6 +14,7 @@ module Decidim
 
       def show
         return unless endorsers.any?
+
         render
       end
 

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

@@ -10,6 +10,7 @@ module Decidim
     class IrreversibleActionModalCell < Decidim::ViewModel
       def show
         return unless action.presence
+
         render :show
       end
 

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

@@ -1,18 +1,18 @@
 <div class="columns mediumlarge-4 hidden-section p-sm">
   <div class="medium-8">
     <%= follow_button_for(model, true) %>
-    <% if amendments_enabled? %>
-      <div class="button-group button-group--collapse mb-s row collapse">
+    <% if amendmendment_creation_enabled? || visible_emendations.any? %>
+      <div class="button-group button-group--collapse mb-s row collapse amend-buttons">
         <%= link_to resource_amendments_path, class: "column medium-4 button light secondary" do %>
-        <%= model.emendations.count %>
-          <% end %>
-          <%= link_to amend_resource_path, class: "column button hollow secondary button--sc" do %>
-            <%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
-          <% end %>
+          <%= visible_emendations.count %>
+        <% end %>
+        <%= link_to amend_resource_path, class: "column button hollow secondary button--sc", disabled: amend_button_disabled? do %>
+          <%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
+        <% end %>
       </div>
     <% end %>
     <% if component_settings.comments_enabled? %>
-      <div class="button-group button-group--collapse row collapse">
+      <div class="button-group button-group--collapse row collapse comment-buttons">
         <% if current_settings.comments_blocked? %>
           <%= content_tag :button, class: "column medium-4 button light secondary", title: t("endorse", scope: "decidim.proposals.participatory_text_proposal.buttons") do %>
             <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %>

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

@@ -33,6 +33,7 @@ module Decidim
 
       def body
         return unless model.participatory_text_level == "article"
+
         formatted = simple_format(present(model).body)
         decidim_sanitize(strip_links(formatted))
       end
@@ -72,6 +73,18 @@ module Decidim
       def participatory_space_type_name
         translated_attribute current_participatory_space.model_name.human
       end
+
+      def visible_emendations
+        @visible_emendations ||= model.visible_emendations_for(current_user)
+      end
+
+      def amendmendment_creation_enabled?
+        (current_component.settings.amendments_enabled? && current_settings.amendment_creation_enabled?)
+      end
+
+      def amend_button_disabled?
+        !amendmendment_creation_enabled?
+      end
     end
   end
 end

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

@@ -5,19 +5,15 @@ require "cell/partial"
 module Decidim
   module Proposals
     # This cell renders the link to the source collaborative draft of a proposal.
-    class ProposalLinkToCollaborativeDraftCell < Decidim::ViewModel
-      def show
-        render if collaborative_draft
-      end
-
+    class ProposalLinkToCollaborativeDraftCell < ProposalLinkedResourcesCell
       private
 
-      def collaborative_draft
-        @collaborative_draft ||= model.linked_resources(:collaborative_draft, "created_from_collaborative_draft").first
+      def linked_resource
+        @linked_resource ||= model.linked_resources(:collaborative_draft, "created_from_collaborative_draft").first
       end
 
       def link_to_resource
-        link_to resource_locator(collaborative_draft).path, class: "link" do
+        link_to resource_locator(linked_resource).path, class: "link" do
           t("link_to_collaborative_draft_text", scope: "decidim.proposals.proposals.show")
         end
       end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the link to the rejected emendation promoted to proposal.
+    class ProposalLinkToRejectedEmendationCell < ProposalLinkedResourcesCell
+      private
+
+      def linked_resource
+        @linked_resource ||= model.linked_promoted_resource
+      end
+
+      def link_to_resource
+        link_to resource_locator(linked_resource).path, class: "link" do
+          if model.emendation?
+            t("link_to_proposal_from_emendation_text", scope: "decidim.proposals.proposals.show")
+          else
+            t("link_to_promoted_emendation_text", scope: "decidim.proposals.proposals.show")
+          end
+        end
+      end
+
+      def link_help_text
+        if model.emendation?
+          t("link_to_proposal_from_emendation_help_text", scope: "decidim.proposals.proposals.show")
+        else
+          t("link_to_promoted_emendation_help_text", scope: "decidim.proposals.proposals.show")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+<div class="text-center mt-sm">
+  <%= link_to_resource %>
+
+  <div class="text-center">
+    <small>
+      <%= link_help_text %>
+    </small>
+  </div>
+</div>

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the linked resource of a proposal.
+    class ProposalLinkedResourcesCell < Decidim::ViewModel
+      def show
+        render if linked_resource
+      end
+    end
+  end
+end

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

@@ -36,6 +36,7 @@ module Decidim
 
       def has_footer?
         return false if model.emendation?
+
         true
       end
 
@@ -45,12 +46,14 @@ module Decidim
 
       def badge_classes
         return super unless options[:full_badge]
+
         state_classes.concat(["label", "proposal-status"]).join(" ")
       end
 
       def statuses
         return [:endorsements_count, :comments_count] if model.draft?
         return [:creation_date, :endorsements_count, :comments_count] if !has_link_to_resource? || !can_be_followed?
+
         [:creation_date, :follow, :endorsements_count, :comments_count]
       end
 

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Rectify::Command
+        include AttachmentMethods
+        include GalleryMethods
         include HashtagsMethods
 
         # Public: Initializes the command.
@@ -28,9 +30,15 @@ module Decidim
             return broadcast(:invalid) if attachment_invalid?
           end
 
+          if process_gallery?
+            build_gallery
+            return broadcast(:invalid) if gallery_invalid?
+          end
+
           transaction do
             create_proposal
             create_attachment if process_attachments?
+            create_gallery if process_gallery?
             send_notification
           end
 
@@ -39,7 +47,7 @@ module Decidim
 
         private
 
-        attr_reader :form, :proposal, :attachment
+        attr_reader :form, :proposal, :attachment, :gallery
 
         def create_proposal
           @proposal = Decidim::Proposals::ProposalBuilder.create(
@@ -47,6 +55,7 @@ module Decidim
             author: form.author,
             action_user: form.current_user
           )
+          @attached_to = @proposal
         end
 
         def attributes
@@ -64,38 +73,6 @@ module Decidim
           }
         end
 
-        def build_attachment
-          @attachment = Attachment.new(
-            title: form.attachment.title,
-            file: form.attachment.file,
-            attached_to: @proposal
-          )
-        end
-
-        def attachment_invalid?
-          if attachment.invalid? && attachment.errors.has_key?(:file)
-            form.attachment.errors.add :file, attachment.errors[:file]
-            true
-          end
-        end
-
-        def attachment_present?
-          form.attachment.file.present?
-        end
-
-        def create_attachment
-          attachment.attached_to = proposal
-          attachment.save!
-        end
-
-        def attachments_allowed?
-          form.current_component.settings.attachments_allowed?
-        end
-
-        def process_attachments?
-          attachments_allowed? && attachment_present?
-        end
-
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",

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

@@ -28,6 +28,8 @@ module Decidim
           end
 
           broadcast(:ok)
+        rescue StandardError
+          broadcast(:invalid_file)
         end
 
         private

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

@@ -40,6 +40,7 @@ module Decidim
 
         def proposals_to_link
           return previous_links if form.same_component?
+
           form.proposals
         end
 

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

@@ -39,7 +39,7 @@ module Decidim
 
         def publish_drafts
           Decidim::Proposals::Proposal.where(component: form.current_component).drafts.find_each do |proposal|
-            add_failure(proposal) unless proposal.update(published_at: Time.current)
+            add_failure(proposal) unless publish_proposal(proposal)
           end
           raise ActiveRecord::Rollback if @failures.any?
         end
@@ -47,6 +47,29 @@ module Decidim
         def add_failure(proposal)
           @failures[proposal.id] = proposal.errors.full_messages
         end
+
+        # This will be the PaperTrail version shown in the version control feature (1 of 1).
+        # For an attribute to appear in the new version it has to be reset
+        # and reassigned, as PaperTrail only keeps track of object CHANGES.
+        def publish_proposal(proposal)
+          title, body = reset_proposal_title_and_body(proposal)
+
+          Decidim.traceability.perform_action!(:create, proposal, form.current_user, visibility: "all") do
+            proposal.update(title: title, body: body, published_at: Time.current)
+          end
+        end
+
+        # Reset the attributes to an empty string and return the old values.
+        def reset_proposal_title_and_body(proposal)
+          title = proposal.title
+          body = proposal.body
+
+          PaperTrail.request(enabled: false) do
+            proposal.update_columns(title: "", body: "") # rubocop:disable Rails/SkipsModelValidations
+          end
+
+          [title, body]
+        end
       end
     end
   end

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

@@ -35,14 +35,18 @@ module Decidim
 
         attr_reader :form
 
+        # Prevents PaperTrail from creating versions while updating participatory text proposals.
+        # A first version will be created when publishing the Participatory Text.
         def update_contents_and_resort_proposals(form)
-          form.proposals.each do |prop_form|
-            proposal = Decidim::Proposals::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 == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
-
-            add_failure(proposal) unless proposal.save
+          PaperTrail.request(enabled: false) do
+            form.proposals.each do |prop_form|
+              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]
+
+              add_failure(proposal) unless proposal.save
+            end
           end
           raise ActiveRecord::Rollback if @failures.any?
         end

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

@@ -6,6 +6,7 @@ module Decidim
       # A command with all the business logic when a user updates a proposal.
       class UpdateProposal < Rectify::Command
         include AttachmentMethods
+        include GalleryMethods
         include HashtagsMethods
 
         # Public: Initializes the command.
@@ -34,10 +35,17 @@ module Decidim
             return broadcast(:invalid) if attachment_invalid?
           end
 
+          if process_gallery?
+            build_gallery
+            return broadcast(:invalid) if gallery_invalid?
+          end
+
           transaction do
             update_proposal
             update_proposal_author
             create_attachment if process_attachments?
+            create_gallery if process_gallery?
+            photo_cleanup!
           end
 
           broadcast(:ok, proposal)
@@ -45,7 +53,7 @@ module Decidim
 
         private
 
-        attr_reader :form, :proposal, :attachment
+        attr_reader :form, :proposal, :attachment, :gallery
 
         def update_proposal
           Decidim.traceability.update!(

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A module with all the gallery common methods for proposals
+    # and collaborative draft commands.
+    # Allows to create several image attachments at once
+    module GalleryMethods
+      private
+
+      def build_gallery
+        @gallery = []
+        @form.add_photos.each do |photo|
+          next unless image? photo
+
+          @gallery << Attachment.new(
+            title: photo.original_filename,
+            file: photo,
+            attached_to: @attached_to
+          )
+        end
+      end
+
+      def image?(image)
+        return unless image.respond_to? :content_type
+
+        image.content_type.start_with? "image"
+      end
+
+      def gallery_invalid?
+        gallery.each do |photo|
+          if photo.invalid? && photo.errors.has_key?(:file)
+            @form.errors.add(:add_photos, photo.errors[:file])
+            return true
+          end
+        end
+        false
+      end
+
+      def create_gallery
+        @gallery.map! do |photo|
+          photo.attached_to = @attached_to
+          photo.save!
+          @form.photos << photo.id.to_s
+        end
+      end
+
+      def photo_cleanup!
+        @attached_to.photos.each do |photo|
+          photo.destroy! if @form.photos.exclude? photo.id.to_s
+        end
+        # manually reset cached photos
+        @attached_to.reload
+        @attached_to.instance_variable_set(:@photos, nil)
+      end
+
+      # maybe a custom settings options would be nice
+      def gallery_allowed?
+        @form.current_component.settings.attachments_allowed?
+      end
+
+      def process_gallery?
+        gallery_allowed? && @form.add_photos.any?
+      end
+    end
+  end
+end