decidim-proposals 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e101137e1dab45f7db4800b65cbc6c4876da84527070874e90e8493e679e42ab
-  data.tar.gz: 291d57eb48bf0a681395a9b81dab330fea4f8aff38401bf75dc9c38e96473150
+  metadata.gz: cf760d1ce319c8806519053c5b3bfe6d48aaa1d91b11f81c0e7fde8b4d6398e4
+  data.tar.gz: 12707f653b6cca47f62a8f34c8204dc8de6a1078fa681a2dd68b6ef89cafb979
 SHA512:
-  metadata.gz: 4175e5d0a23e692450b00fac603472b61f9d440f9e0ae4becf71c0d2def320ec62ff96ff2121bc3087d8cf0c2c6ac4f5854c4e6f458b86809c6117322a0fde05
-  data.tar.gz: 4aa1de838049aeb09797d4ad29462a2d95ecda7f80e6780c4b1a44bb11cfaaac7f0e3af09e02816c8b436f8ccb142f5e3451722601f36f5ec3cd8b6c5cd51fea
+  metadata.gz: 55cd9f8ec704001e24cc90dc1d0be2a4153e4a1f2d003b68793924b91e0ffce786726b13e91664304b9dea9d26b2b18c844e9cd1e894962b1762a3a55004136f
+  data.tar.gz: b2f3f6e9760b568fbcee9d4e1cbc0ae724b16430731719c743bf90d8424600724a340aaa5d9788fb4a191a17f08f997c3011d3476bf9fabde5ac35602e726e70

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

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def description
-        decidim_sanitize_editor(present(model).body.truncate(100, separator: /\s/), strip_tags: true)
+        decidim_sanitize_editor(present(model).body.truncate(100, separator: /\s/))
       end
 
       def has_badge?

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

@@ -19,7 +19,7 @@ module Decidim
       def proposals
         @proposals ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
                                                    .where(component: model)
-                                                   .order_randomly(rand * 2 - 1)
+                                                   .order_randomly((rand * 2) - 1)
       end
 
       def proposals_to_render
@@ -29,6 +29,14 @@ module Decidim
       def proposals_count
         @proposals_count ||= proposals.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/proposals/highlighted_proposals_for_component"
+        hash << proposals.cache_key_with_version
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end

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

@@ -21,7 +21,7 @@ module Decidim
       end
 
       def title
-        present(model).title(html_escape: true)
+        decidim_html_escape(present(model).title)
       end
 
       def body
@@ -57,13 +57,11 @@ module Decidim
       end
 
       def base_statuses
-        @base_statuses ||= begin
-          if endorsements_visible?
-            [:endorsements_count, :comments_count]
-          else
-            [:comments_count]
-          end
-        end
+        @base_statuses ||= if endorsements_visible?
+                             [:endorsements_count, :comments_count]
+                           else
+                             [:comments_count]
+                           end
       end
 
       def statuses

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic to accept a user request to
     # contribute to a collaborative draft.
-    class AcceptAccessToCollaborativeDraft < Rectify::Command
+    class AcceptAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin answers a proposal.
-      class AnswerProposal < Rectify::Command
+      class AnswerProposal < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to assign proposals to a given
       # valuator.
-      class AssignProposalsToValuator < Rectify::Command
+      class AssignProposalsToValuator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when a user creates a new proposal.
-      class CreateProposal < Rectify::Command
+      class CreateProposal < Decidim::Command
         include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
@@ -37,13 +37,12 @@ module Decidim
 
           transaction do
             create_proposal
-            create_attachment if process_attachments?
             create_gallery if process_gallery?
+            create_attachment(weight: first_attachment_weight) if process_attachments?
             link_author_meeeting if form.created_in_meeting?
+            send_notification
           end
 
-          send_notification
-
           broadcast(:ok, proposal)
         end
 
@@ -82,18 +81,22 @@ module Decidim
         end
 
         def send_notification
-          return unless proposal
-
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",
             event_class: Decidim::Proposals::PublishProposalEvent,
             resource: proposal,
-            followers: proposal.participatory_space.followers,
+            followers: @proposal.participatory_space.followers,
             extra: {
               participatory_space: true
             }
           )
         end
+
+        def first_attachment_weight
+          return 1 if proposal.photos.count.zero?
+
+          proposal.photos.count
+        end
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin creates a private note proposal.
-      class CreateProposalNote < Rectify::Command
+      class CreateProposalNote < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -59,7 +59,7 @@ module Decidim
             affected_users: affected_users
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic related with an admin discarding participatory text proposals.
-      class DiscardParticipatoryText < Rectify::Command
+      class DiscardParticipatoryText < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A PreviewParticipatoryTextForm form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # a participatory text.
-      class ImportParticipatoryText < Rectify::Command
+      class ImportParticipatoryText < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # one component to another.
-      class ImportProposals < Rectify::Command
+      class ImportProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -76,10 +76,7 @@ module Decidim
         end
 
         def proposal_already_copied?(original_proposal, target_component)
-          # Note: we are including also proposals from unpublished components
-          # because otherwise duplicates could be created until the component is
-          # published.
-          original_proposal.linked_resources(:proposals, "copied_from_component", component_published: false).any? do |proposal|
+          original_proposal.linked_resources(:proposals, "copied_from_component").any? do |proposal|
             proposal.component == target_component
           end
         end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin merges proposals from
       # one component to another.
-      class MergeProposals < Rectify::Command
+      class MergeProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command to notify about the change of the published state for a proposal.
-      class NotifyProposalAnswer < Rectify::Command
+      class NotifyProposalAnswer < Decidim::Command
         # Public: Initializes the command.
         #
         # proposal - The proposal to write the answer for.
@@ -21,8 +21,6 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if proposal.blank?
-
           if proposal.published_state? && state_changed?
             transaction do
               increment_score

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic to publish many answers at once.
-      class PublishAnswers < Rectify::Command
+      class PublishAnswers < Decidim::Command
         # Public: Initializes the command.
         #
         # component - The component that contains the answers.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin splits proposals from
       # one component to another.
-      class SplitProposals < Rectify::Command
+      class SplitProposals < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to unassign proposals from a given
       # valuator.
-      class UnassignProposalsFromValuator < Rectify::Command
+      class UnassignProposalsFromValuator < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when an admin updates participatory text proposals.
-      class UpdateParticipatoryText < Rectify::Command
+      class UpdateParticipatoryText < Decidim::Command
         include Decidim::TranslatableAttributes
 
         # Public: Initializes the command.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       # A command with all the business logic when a user updates a proposal.
-      class UpdateProposal < Rectify::Command
+      class UpdateProposal < Decidim::Command
         include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
@@ -45,8 +45,8 @@ module Decidim
           transaction do
             update_proposal
             update_proposal_author
-            create_attachment if process_attachments?
             create_gallery if process_gallery?
+            create_attachment(weight: first_attachment_weight) if process_attachments?
             photo_cleanup!
           end
 
@@ -80,6 +80,12 @@ module Decidim
           proposal.save!
           proposal
         end
+
+        def first_attachment_weight
+          return 1 if proposal.photos.count.zero?
+
+          proposal.photos.count
+        end
       end
     end
   end

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

@@ -4,7 +4,9 @@ module Decidim
   module Proposals
     module Admin
       #  A command with all the business logic when an admin batch updates proposals category.
-      class UpdateProposalCategory < Rectify::Command
+      class UpdateProposalCategory < Decidim::Command
+        include TranslatableAttributes
+
         # Public: Initializes the command.
         #
         # category_id - the category id to update
@@ -33,13 +35,13 @@ module Decidim
           @response[:category_name] = @category.translated_name
           Proposal.where(id: @proposal_ids).find_each do |proposal|
             if @category == proposal.category
-              @response[:errored] << proposal.title
+              @response[:errored] << translated_attribute(proposal.title)
             else
               transaction do
                 update_proposal_category proposal
                 notify_author proposal if proposal.coauthorships.any?
               end
-              @response[:successful] << proposal.title
+              @response[:successful] << translated_attribute(proposal.title)
             end
           end
 

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     module Admin
       #  A command with all the business logic when an admin batch updates proposals scope.
-      class UpdateProposalScope < Rectify::Command
+      class UpdateProposalScope < Decidim::Command
         include TranslatableAttributes
         # Public: Initializes the command.
         #
@@ -44,13 +44,13 @@ module Decidim
           @response[:scope_name] = translated_attribute(scope.name, scope.organization)
           Proposal.where(id: proposal_ids).find_each do |proposal|
             if scope == proposal.scope
-              @response[:errored] << proposal.title
+              @response[:errored] << translated_attribute(proposal.title)
             else
               transaction do
                 update_proposal_scope proposal
                 notify_author proposal if proposal.coauthorships.any?
               end
-              @response[:successful] << proposal.title
+              @response[:successful] << translated_attribute(proposal.title)
             end
           end
         end

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

@@ -3,8 +3,8 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new collaborative draft.
-    class CreateCollaborativeDraft < Rectify::Command
-      include ::Decidim::AttachmentMethods
+    class CreateCollaborativeDraft < Decidim::Command
+      include ::Decidim::MultipleAttachmentsMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -27,13 +27,13 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         if process_attachments?
-          build_attachment
-          return broadcast(:invalid) if attachment_invalid?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
         end
 
         transaction do
           create_collaborative_draft
-          create_attachment if process_attachments?
+          create_attachments if process_attachments?
         end
 
         broadcast(:ok, collaborative_draft)

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
-    class CreateProposal < Rectify::Command
+    class CreateProposal < Decidim::Command
       include ::Decidim::AttachmentMethods
       include HashtagsMethods
 

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user destroys a draft proposal.
-    class DestroyProposal < Rectify::Command
+    class DestroyProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to destroy.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user publishes a collaborative_draft.
-    class PublishCollaborativeDraft < Rectify::Command
+    class PublishCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # collaborative_draft - The collaborative_draft to publish.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user publishes a draft proposal.
-    class PublishProposal < Rectify::Command
+    class PublishProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to publish.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic to reject a user request to
     # contribute to a collaborative draft.
-    class RejectAccessToCollaborativeDraft < Rectify::Command
+    class RejectAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user requests access
     # to edit a collaborative draft.
-    class RequestAccessToCollaborativeDraft < Rectify::Command
+    class RequestAccessToCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user unvotes a proposal.
-    class UnvoteProposal < Rectify::Command
+    class UnvoteProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - A Decidim::Proposals::Proposal object.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user updates a collaborative_draft.
-    class UpdateCollaborativeDraft < Rectify::Command
+    class UpdateCollaborativeDraft < Decidim::Command
       include HashtagsMethods
 
       # Public: Initializes the command.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user updates a proposal.
-    class UpdateProposal < Rectify::Command
+    class UpdateProposal < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
       include GalleryMethods
       include HashtagsMethods
@@ -50,7 +50,7 @@ module Decidim
           document_cleanup!
 
           create_gallery if process_gallery?
-          create_attachments if process_attachments?
+          create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end
 
         broadcast(:ok, proposal)
@@ -116,6 +116,12 @@ module Decidim
         end
       end
 
+      def first_attachment_weight
+        return 1 if proposal.photos.count.zero?
+
+        proposal.photos.count
+      end
+
       def user_group
         @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user votes a proposal.
-    class VoteProposal < Rectify::Command
+    class VoteProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - A Decidim::Proposals::Proposal object.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user withdraws a collaborative_draft.
-    class WithdrawCollaborativeDraft < Rectify::Command
+    class WithdrawCollaborativeDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # collaborative_draft     - The collaborative_draft to withdraw.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     # A command with all the business logic when a user withdraws a new proposal.
-    class WithdrawProposal < Rectify::Command
+    class WithdrawProposal < Decidim::Command
       # Public: Initializes the command.
       #
       # proposal     - The proposal to withdraw.

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -30,12 +30,14 @@ module Decidim
         end
 
         def default_order
-          @default_order ||= begin
-            default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
-            return order_by_default if default_order == "default"
+          @default_order ||= fetch_default_order
+        end
 
-            possible_orders.include?(default_order) ? default_order : order_by_default
-          end
+        def fetch_default_order
+          default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
+          return order_by_default if default_order == "default"
+
+          possible_orders.include?(default_order) ? default_order : order_by_default
         end
 
         def order_by_default

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

@@ -65,9 +65,10 @@ module Decidim
               flash.now[:notice] = update_proposals_bulk_response_successful(@response, :category)
               flash.now[:alert] = update_proposals_bulk_response_errored(@response, :category)
             end
-            respond_to do |format|
-              format.js
-            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
           end
         end
 
@@ -114,10 +115,9 @@ module Decidim
               flash.now[:notice] = update_proposals_bulk_response_successful(@response, :scope)
               flash.now[:alert] = update_proposals_bulk_response_errored(@response, :scope)
             end
-
-            respond_to do |format|
-              format.js
-            end
+          end
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
           end
         end
 

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

@@ -25,13 +25,13 @@ module Decidim
 
       def index
         @collaborative_drafts = search
-                                .results
+                                .result
                                 .not_hidden
                                 .includes(:category)
                                 .includes(:scope)
 
-        @collaborative_drafts = reorder(@collaborative_drafts)
         @collaborative_drafts = paginate(@collaborative_drafts)
+        @collaborative_drafts = reorder(@collaborative_drafts)
       end
 
       def show
@@ -63,7 +63,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.collaborative_drafts.create.error", scope: "decidim")
-            render :new
+            render :complete
           end
         end
       end
@@ -134,19 +134,19 @@ module Decidim
       end
 
       def geocoded_collaborative_draft
-        @geocoded_collaborative_draft ||= search.results.not_hidden.select(&:geocoded_and_valid?)
+        @geocoded_collaborative_draft ||= search.result.not_hidden.select(&:geocoded_and_valid?)
       end
 
-      def search_klass
-        CollaborativeDraftSearch
+      def search_collection
+        CollaborativeDraft.where(component: current_component).not_hidden
       end
 
       def default_filter_params
         {
-          search_text: "",
-          category_id: default_filter_category_params,
-          state: %w(open),
-          scope_id: default_filter_scope_params,
+          search_text_cont: "",
+          with_any_category: default_filter_category_params,
+          with_any_state: %w(open),
+          with_any_scope: default_filter_scope_params,
           related_to: ""
         }
       end