decidim-proposals 0.18.1 → 0.19.0

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

@@ -50,6 +50,7 @@ module Decidim
 
       def update_temporary_votes
         return unless minimum_votes_per_user? && user_votes.count < minimum_votes_per_user
+
         user_votes.each { |vote| vote.update(temporary: true) }
       end
 

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

@@ -67,7 +67,12 @@ module Decidim
       end
 
       def update_proposal
-        @proposal.update!(attributes)
+        @proposal = Decidim.traceability.update!(
+          @proposal,
+          current_user,
+          attributes,
+          visibility: "public-only"
+        )
         @proposal.coauthorships.clear
         @proposal.add_coauthor(current_user, user_group: user_group)
       end

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

@@ -55,6 +55,7 @@ module Decidim
 
       def update_temporary_votes
         return unless minimum_votes_per_user? && user_votes.count >= minimum_votes_per_user
+
         user_votes.each { |vote| vote.update(temporary: false) }
       end
 

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

@@ -9,15 +9,10 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        helper_method :order, :available_orders, :random_seed
+        include Decidim::Orderable
 
         private
 
-        # Gets how the proposals should be ordered based on the choice made by the user.
-        def order
-          @order ||= detect_order(params[:order]) || default_order
-        end
-
         # Available orders based on enabled settings
         def available_orders
           @available_orders ||= begin
@@ -31,15 +26,6 @@ module Decidim
           detect_order("most_contributed")
         end
 
-        # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
-        def random_seed
-          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-        end
-
-        def detect_order(candidate)
-          available_orders.detect { |order| order == candidate }
-        end
-
         def reorder(drafts)
           case order
           when "random"

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

@@ -9,15 +9,10 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        helper_method :order, :available_orders, :random_seed
+        include Decidim::Orderable
 
         private
 
-        # Gets how the proposals should be ordered based on the choice made by the user.
-        def order
-          @order ||= detect_order(params[:order]) || default_order
-        end
-
         # Available orders based on enabled settings
         def available_orders
           @available_orders ||= begin
@@ -43,15 +38,6 @@ module Decidim
           most_voted_order_available? && current_settings.votes_blocked?
         end
 
-        # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
-        def random_seed
-          @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
-        end
-
-        def detect_order(candidate)
-          available_orders.detect { |order| order == candidate }
-        end
-
         def reorder(proposals)
           case order
           when "random"

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

@@ -34,6 +34,11 @@ module Decidim
               flash.now[:alert] = I18n.t("participatory_texts.import.invalid", scope: "decidim.proposals.admin")
               render action: "new_import"
             end
+
+            on(:invalid_file) do
+              flash.now[:alert] = I18n.t("participatory_texts.import.invalid_file", scope: "decidim.proposals.admin")
+              render action: "new_import"
+            end
           end
         end
 

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

@@ -13,6 +13,7 @@ module Decidim
 
       def proposal_limit
         return nil if component_settings.proposal_limit.zero?
+
         component_settings.proposal_limit
       end
 

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

@@ -34,6 +34,7 @@ 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({})

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

@@ -20,7 +20,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render json: { error: I18n.t("proposal_endorsements.create.error", scope: "decidim.proposals") }, status: 422
+            render json: { error: I18n.t("proposal_endorsements.create.error", scope: "decidim.proposals") }, status: :unprocessable_entity
           end
         end
       end

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

@@ -29,7 +29,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: 422
+            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: :unprocessable_entity
           end
         end
       end

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

@@ -10,7 +10,7 @@ module Decidim
       include Decidim::ApplicationHelper
       include FormFactory
       include FilterResource
-      include Orderable
+      include Decidim::Proposals::Orderable
       include Paginable
 
       helper_method :form_presenter
@@ -54,7 +54,8 @@ module Decidim
       end
 
       def show
-        raise ActionController::RoutingError, "Not Found" unless set_proposal
+        raise ActionController::RoutingError, "Not Found" if @proposal.blank? || !can_show_proposal?
+
         @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
@@ -189,27 +190,15 @@ module Decidim
 
       def withdraw
         enforce_permission_to :withdraw, :proposal, proposal: @proposal
-        if @proposal.emendation?
-          Decidim::Amendable::Withdraw.call(@proposal, current_user) do
-            on(:ok) do |_proposal|
-              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
-              redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
-            end
-            on(:invalid) do
-              flash[:alert] = I18n.t("proposals.update.error", scope: "decidim")
-              redirect_to Decidim::ResourceLocatorPresenter.new(@emendation).path
-            end
+
+        WithdrawProposal.call(@proposal, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
+            redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
-        else
-          WithdrawProposal.call(@proposal, current_user) do
-            on(:ok) do |_proposal|
-              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
-              redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
-            end
-            on(:has_supports) do
-              flash[:alert] = I18n.t("proposals.withdraw.errors.has_supports", scope: "decidim")
-              redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
-            end
+          on(:has_supports) do
+            flash[:alert] = I18n.t("proposals.withdraw.errors.has_supports", scope: "decidim")
+            redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
         end
       end
@@ -234,7 +223,8 @@ module Decidim
       end
 
       def proposal_draft
-        Proposal.from_all_author_identities(current_user).not_hidden.where(component: current_component).find_by(published_at: nil)
+        Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
+                .where(component: current_component).find_by(published_at: nil)
       end
 
       def ensure_is_draft
@@ -246,6 +236,15 @@ module Decidim
         @proposal = Proposal.published.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
+      # Returns true if the proposal is NOT an emendation or the user IS an admin.
+      # Returns false if the proposal is not found or the proposal IS an emendation
+      # and is NOT visible to the user based on the component's amendments settings.
+      def can_show_proposal?
+        return true if @proposal&.amendable? || current_user&.admin?
+
+        Proposal.only_visible_emendations_for(current_user, current_component).published.include?(@proposal)
+      end
+
       def form_proposal_params
         form(ProposalForm).from_params(params)
       end

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

@@ -20,6 +20,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
 
         validates :title, :body, presence: true
         validates :title, length: { maximum: 150 }
@@ -116,6 +118,7 @@ module Decidim
         # this problem.
         def notify_missing_attachment_if_errored
           errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
+          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
         end
 
         def ordered_hashtag_list(string)

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

@@ -20,6 +20,7 @@ module Decidim
 
         def target_component
           return current_component if clean_target_component_id == current_component.id
+
           @target_component ||= current_component.siblings.find_by(id: target_component_id)
         end
 

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

@@ -28,6 +28,7 @@ module Decidim
 
       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

data/app/helpers/decidim/proposals/admin/proposals_helper.rb

@@ -11,6 +11,7 @@ module Decidim
         # in forms.
         def meetings_as_authors_selected
           return unless @proposal.present? && @proposal.official_meeting?
+
           @meetings_as_authors_selected ||= @proposal.authors.pluck(:id)
         end
       end

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

@@ -10,7 +10,7 @@ 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,
+          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))

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

@@ -18,11 +18,13 @@ module Decidim
 
       def has_actions?
         return context[:has_actions] if context[:has_actions].present?
+
         proposals_controller? && index_action? && current_settings.votes_enabled? && !model.draft?
       end
 
       def has_footer?
         return context[:has_footer] if context[:has_footer].present?
+
         proposals_controller? && index_action? && current_settings.votes_enabled? && !model.draft?
       end
 

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

@@ -11,6 +11,7 @@ module Decidim
       # Returns a string with the value of the css classes.
       def endorsement_button_classes(from_proposals_list)
         return "small" if from_proposals_list
+
         "small compact light button--sc expanded"
       end
 

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

@@ -11,6 +11,7 @@ module Decidim
       # Returns a hash with the css classes for the count number and label
       def votes_count_classes(from_proposals_list)
         return { number: "card__support__number", label: "" } if from_proposals_list
+
         { number: "extra__suport-number", label: "extra__suport-text" }
       end
 
@@ -21,6 +22,7 @@ module Decidim
       # Returns a string with the value of the css classes.
       def vote_button_classes(from_proposals_list)
         return "card__button button--sc" if from_proposals_list
+
         "expanded button--sc"
       end
 
@@ -29,6 +31,7 @@ module Decidim
       # Returns an Integer if set, nil otherwise.
       def vote_limit
         return nil if component_settings.vote_limit.zero?
+
         component_settings.vote_limit
       end
 
@@ -51,6 +54,7 @@ module Decidim
       # Returns an Integer with the maximum amount of votes, nil otherwise.
       def threshold_per_proposal
         return nil unless component_settings.threshold_per_proposal.positive?
+
         component_settings.threshold_per_proposal
       end
 
@@ -89,6 +93,7 @@ module Decidim
       # Returns a number with the remaining votes for that user
       def remaining_votes_count_for(user)
         return 0 unless vote_limit_enabled?
+
         proposals = Proposal.where(component: current_component)
         votes_count = ProposalVote.where(author: user, proposal: proposals).size
         component_settings.vote_limit - votes_count

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

@@ -57,6 +57,7 @@ module Decidim
       # current_step - A symbol of the current step
       def proposal_wizard_stepper_step(step, current_step)
         return if step == :step_4 && type_of == :collaborative_drafts
+
         content_tag(:li, proposal_wizard_step_name(step), class: proposal_wizard_step_classes(step, current_step).to_s)
       end
 

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

@@ -15,6 +15,7 @@ module Decidim
       include Decidim::Proposals::CommentableCollaborativeDraft
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::Randomable
 
       has_many :collaborator_requests,
                class_name: "Decidim::Proposals::CollaborativeDraftCollaboratorRequest",

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

@@ -23,12 +23,13 @@ module Decidim
       include Decidim::Proposals::ParticipatoryTextSection
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
+      include Decidim::Randomable
 
       fingerprint fields: [:title, :body]
 
       amendable(
         fields: [:title, :body],
-        form:   "Decidim::Proposals::ProposalForm"
+        form: "Decidim::Proposals::ProposalForm"
       )
 
       component_manifest_name "proposals"
@@ -69,13 +70,6 @@ module Decidim
                         index_on_create: ->(proposal) { proposal.official? },
                         index_on_update: ->(proposal) { proposal.visible? })
 
-      def self.order_randomly(seed)
-        transaction do
-          connection.execute("SELECT setseed(#{connection.quote(seed)})")
-          order(Arel.sql("RANDOM()")).load
-        end
-      end
-
       def self.log_presenter_class_for(_log)
         Decidim::Proposals::AdminLog::ProposalPresenter
       end
@@ -226,6 +220,7 @@ module Decidim
       # user - the user to check for authorship
       def editable_by?(user)
         return true if draft?
+
         !answered? && within_edit_time_limit? && !copied_from_other_component? && created_by?(user)
       end
 
@@ -270,6 +265,7 @@ module Decidim
       # Checks whether the proposal is inside the time window to be editable or not once published.
       def within_edit_time_limit?
         return true if draft?
+
         limit = updated_at + component.settings.proposal_edit_before_minutes.minutes
         Time.current < limit
       end

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

@@ -23,11 +23,13 @@ module Decidim
       # Private: check if the proposal and the author have the same organization
       def author_and_proposal_same_organization
         return if !proposal || !author
+
         errors.add(:proposal, :invalid) unless author.organization == proposal.organization
       end
 
       def proposal_not_rejected
         return unless proposal
+
         errors.add(:proposal, :invalid) if proposal.rejected?
       end
     end

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

@@ -36,11 +36,13 @@ module Decidim
       # Private: check if the proposal and the author have the same organization
       def author_and_proposal_same_organization
         return if !proposal || !author
+
         errors.add(:proposal, :invalid) unless author.organization == proposal.organization
       end
 
       def proposal_not_rejected
         return unless proposal
+
         errors.add(:proposal, :invalid) if proposal.rejected?
       end
     end

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -59,6 +59,7 @@ module Decidim
 
         def admin_edition_is_available?
           return unless proposal
+
           (proposal.official? || proposal.official_meeting?) && proposal.votes.empty?
         end