decidim-proposals 0.30.0.rc3 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 555324c80eedfe348072f67f5b6334273f5422024ecd000e0a3a09c4e32eec42
-  data.tar.gz: ae328a90906fd92093c6255fa69cd8925393754f85e28243ff1f5605c55ddec7
+  metadata.gz: 81bba03dc800ce062b503bcaad10e09f1b3bc016dd02c647dc08f1e893a64f68
+  data.tar.gz: 4770709bececf57eef406cf4e879f7be42132a81782911c79c3dc8f16d690035
 SHA512:
-  metadata.gz: 49260eaf53b5f57edeaed6e8823c9d653fc73c8dcb12c3e96e14a59f7284e58951a119152624252f68a6861fd9aad6a6ff3e08b584280f82f93cf01152d9bd7f
-  data.tar.gz: c735d0fdba1fd18fec70df9f03351167a838d12ba9a042674fe43d9355eab0598543091fd8a5597f15ac784bbe11fa3eddcbeba8745c4cf4fe4b32e0a48c0471
+  metadata.gz: dc1bf3583428e26ca578f26d84a24cb0b5cb36da2938e143d9fbb23d009b8487a8270e1dc40ab3df9e370cd79bf636a974f22c1b238581aa6e770a995bbe6d2c
+  data.tar.gz: 551a0f369ace9f5881edb71d6fc4bc9b4c212e597e5df2cd67b01bbf0300f321db1729ac5fa132d02ebd55763fa18b7247c9522cf22ac8a7ac034738ec958cc9

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

@@ -10,18 +10,6 @@
     <% end %>
   <% end %>
 </div>
-
-<div class="flex items-center justify-between space-x-6">
-  <span class="content-block__span flex-shrink-0">
-    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-  </span>
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
-      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
-</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
     <% proposals_to_render.each do |p| %>

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

@@ -46,6 +46,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def cache_hash
         @cache_hash ||= begin
           hash = []
@@ -63,10 +64,11 @@ module Decidim
           hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
-
+          hash << (current_user&.id || 0)
           hash.join(Decidim.cache_key_separator)
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def classes
         super.merge(metadata: "card__list-metadata")

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

@@ -27,6 +27,8 @@ module Decidim
         "decidim/proposals/proposal_vote"
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def cache_hash
         @cache_hash ||= begin
           hash = []
@@ -44,9 +46,12 @@ module Decidim
           hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
           hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
           hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+          hash << (current_user&.id || 0)
 
           hash.join(Decidim.cache_key_separator)
         end
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

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

@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: resource, from_proposals_list: true } %>
   <% else %>
@@ -24,7 +24,7 @@
     <div id="proposal-<%= resource.id %>-vote-button" class="card__proposals-votes-container">
       <% if !current_user %>
         <% if current_settings.votes_blocked? %>
-          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, disabled: true %>
+          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
         <% else %>
           <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(resource) } do %>
             <%= t("decidim.proposals.proposals.vote_button.vote") %>
@@ -32,7 +32,7 @@
           <% end %>
         <% end %>
       <% else %>
-        <% if @voted_proposals ? @voted_proposals.include?(resource.id) : resource.voted_by?(current_user) %>
+        <% if proposal_voted_by_user?(resource) %>
           <%= action_authorized_button_to(
                 :vote,
                 proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:),
@@ -40,6 +40,7 @@
                 method: :delete,
                 remote: true,
                 data: {
+                  "proposal-vote-button": true,
                   disable: true,
                   original: t("decidim.proposals.proposals.vote_button.already_voted"),
                   replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
@@ -55,14 +56,17 @@
           <% end %>
         <% else %>
           <% if resource.maximum_votes_reached? && !resource.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
           <% else %>
-            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, disabled: true %>
+            <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, disabled: true, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
+                <%= t("decidim.proposals.proposals.vote_button.vote") %>
+                <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
+              <% end %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true, data: { "proposal-vote-button": true } %>
             <% else %>
-              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, data: { disable: true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, data: { "proposal-vote-button": true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
                 <%= t("decidim.proposals.proposals.vote_button.vote") %>
                 <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
               <% end %>

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

@@ -48,15 +48,6 @@ module Decidim
           @proposals = reorder(@proposals)
           @proposals = paginate(@proposals)
           @proposals = @proposals.includes(:component, :coauthorships, :attachments)
-
-          @voted_proposals = if current_user
-                               ProposalVote.where(
-                                 author: current_user,
-                                 proposal: @proposals.pluck(:id)
-                               ).pluck(:decidim_proposal_id)
-                             else
-                               []
-                             end
         end
       end
 

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

@@ -11,7 +11,7 @@ module Decidim
       def versioned_resource
         @versioned_resource ||=
           if params[:proposal_id]
-            present(Proposal.where(component: current_component).find(params[:proposal_id]))
+            present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
           else
             CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
           end

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

@@ -16,20 +16,9 @@ module Decidim
         attribute :internal_state, String
 
         validates :internal_state, presence: true, inclusion: { in: :proposal_states }
-        validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
-
-        with_options if: :costs_required? do
-          validates :cost, numericality: true, presence: true
-          validates :cost_report, translatable_presence: true
-          validates :execution_period, translatable_presence: true
-        end
 
         alias state internal_state
 
-        def costs_required?
-          costs_enabled? && state == "accepted"
-        end
-
         def publish_answer?
           current_component.current_settings.publish_answers_immediately?
         end
@@ -39,10 +28,6 @@ module Decidim
         def proposal_states
           Decidim::Proposals::ProposalState.where(component: current_component).pluck(:token).map(&:to_s) + ["not_answered"]
         end
-
-        def costs_enabled?
-          current_component.current_settings.answers_with_costs?
-        end
       end
     end
   end

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

@@ -17,8 +17,6 @@ module Decidim
       include Decidim::RichTextEditorHelper
       include Decidim::CheckBoxesTreeHelper
 
-      delegate :minimum_votes_per_user, to: :component_settings
-
       # Public: The state of a proposal in a way a human can understand.
       #
       # state - The String state of the proposal.
@@ -85,10 +83,6 @@ module Decidim
         proposal_limit.present?
       end
 
-      def minimum_votes_per_user_enabled?
-        minimum_votes_per_user.positive?
-      end
-
       def not_from_collaborative_draft(proposal)
         proposal.linked_resources(:proposals, "created_from_collaborative_draft").empty?
       end
@@ -138,13 +132,6 @@ module Decidim
         component_settings.proposal_limit
       end
 
-      def votes_given
-        @votes_given ||= ProposalVote.where(
-          proposal: Proposal.where(component: current_component),
-          author: current_user
-        ).count
-      end
-
       def layout_item_classes
         if show_voting_rules?
           "layout-item lg:pt-4"

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

@@ -4,14 +4,7 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal votes partials
     module ProposalVotesHelper
-      # Public: Gets the vote limit for each user, if set.
-      #
-      # Returns an Integer if set, nil otherwise.
-      def vote_limit
-        return nil if component_settings.vote_limit&.zero?
-
-        component_settings.vote_limit
-      end
+      delegate :minimum_votes_per_user, to: :component_settings
 
       # Check if the vote limit is enabled for the current component
       #
@@ -20,6 +13,10 @@ module Decidim
         vote_limit.present?
       end
 
+      def minimum_votes_per_user_enabled?
+        minimum_votes_per_user.positive?
+      end
+
       # Public: Checks if threshold per proposal are set.
       #
       # Returns true if set, false otherwise.
@@ -64,17 +61,21 @@ module Decidim
         current_user && votes_enabled? && vote_limit_enabled? && !votes_blocked?
       end
 
+      def proposal_voted_by_user?(proposal)
+        return false if current_user.blank? || proposal.blank?
+
+        all_voted_proposals_by_user.include?(proposal.id)
+      end
+
       # Return the remaining votes for a user if the current component has a vote limit
       #
       # user - A User object
       #
       # Returns a number with the remaining votes for that user
-      def remaining_votes_count_for(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
+        component_settings.vote_limit - votes_given
       end
 
       # Return the remaining minimum votes for a user if the current component has a vote limit
@@ -82,12 +83,34 @@ module Decidim
       # user - A User object
       #
       # Returns a number with the remaining minimum votes for that user
-      def remaining_minimum_votes_count_for(user)
-        return 0 unless vote_limit_enabled?
+      def remaining_minimum_votes_count_for_user
+        return 0 unless minimum_votes_per_user_enabled?
+
+        component_settings.minimum_votes_per_user - votes_given
+      end
+
+      private
+
+      def votes_given
+        @votes_given ||= all_voted_proposals_by_user.length
+      end
+
+      # Gets the vote limit for each user, if set.
+      #
+      # Returns an Integer if set, nil otherwise.
+      def vote_limit
+        return nil if component_settings.vote_limit&.zero?
+
+        component_settings.vote_limit
+      end
 
-        votes_count = Decidim::Proposals::ProposalVote.joins(:proposal).where(decidim_proposals_proposals: { decidim_component_id: current_component.id }).where(author: user).count
+      def all_voted_proposals_by_user
+        return [] if current_user.blank?
 
-        component_settings.minimum_votes_per_user - votes_count
+        @all_voted_proposals ||= ProposalVote.where(
+          proposal: Proposal.where(component: current_component),
+          author: current_user
+        ).pluck(:decidim_proposal_id)
       end
     end
   end

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

@@ -12,9 +12,7 @@ module Decidim
       end
 
       def proposal_has_costs?
-        @proposal.cost.present? &&
-          translated_attribute(@proposal.cost_report).present? &&
-          translated_attribute(@proposal.execution_period).present?
+        @proposal.cost.present?
       end
 
       def toggle_view_mode_link(current_mode, target_mode, title, params)

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

@@ -46,9 +46,8 @@ module Decidim
         authored_by?(user)
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
+      def presenter
+        Decidim::Proposals::CollaborativeDraftPresenter.new(self)
       end
 
       # Public: Overrides the `reported_attributes` Reportable concern method.

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

@@ -303,11 +303,6 @@ module Decidim
         state == "evaluating"
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
       # Returns the presenter for this author, to be used in the views.
       # Required by ResourceRenderer.
       def presenter

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

@@ -31,6 +31,7 @@ module Decidim
 
       def update_proposal_votes_count
         proposal.update_votes_count
+        proposal.touch # rubocop:disable Rails/SkipsModelValidations
       end
 
       # Private: check if the proposal and the author have the same organization

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -400,3 +400,9 @@
     @apply lg:col-start-2 lg:col-span-10;
   }
 }
+
+.card__proposals-item {
+  & + & {
+    @apply mt-6;
+  }
+}

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -23,12 +23,10 @@
       morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
     }
 
-    <% if remaining_votes_count_for(current_user) == 0 %>
+    <% if remaining_votes_count_for_user == 0 %>
       $notVotedButtons.attr('disabled', true);
-      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
     <% else %>
       $notVotedButtons.attr('disabled', false);
-      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
     <% end %>
   }());
 <% end %>
@@ -44,9 +42,8 @@
       morphdom($votingRules[0], '<%= j(render partial: "decidim/proposals/proposals/voting_rules").strip.html_safe %>');
     }
 
-    <% if remaining_minimum_votes_count_for(current_user).zero? %>
+    <% if minimum_votes_per_user_enabled? && remaining_minimum_votes_count_for_user.zero? %>
       $votingRulesNode.prepend(`<%= j(render partial: "decidim/proposals/proposals/notification_alert_box").strip.html_safe %>`)
-
     <% end %>
     if ($exitProposalModal[0]) {
       morphdom($exitProposalModal[0], '<%= j(render partial: "decidim/proposals/proposals/exit_modal").strip.html_safe %>')
@@ -56,7 +53,7 @@
     }
 
     if ($remainingVotesNotification[0]) {
-      morphdom($remainingVotesNotification[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_notification").strip.html_safe %>')
+      morphdom($remainingVotesNotification[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_notification").strip.html_safe %>');
     }
   }());
 <% end %>

data/app/views/decidim/proposals/proposals/_exit_modal.html.erb

@@ -1,11 +1,11 @@
 <%= decidim_modal id: "exit-proposal-notification" do %>
-  <div data-dialog-container data-minimum-votes-reached="<%= remaining_minimum_votes_count_for(current_user).zero? %>" data-minimum-votes-count="<%= minimum_votes_per_user - remaining_minimum_votes_count_for(current_user) %>">
+  <div data-dialog-container data-minimum-votes-reached="<%= remaining_minimum_votes_count_for_user.zero? %>" data-minimum-votes-count="<%= minimum_votes_per_user - remaining_minimum_votes_count_for_user %>">
     <%= icon "information-line" %>
     <h3 class="h3 text-base" id="dialog-title-exit-proposal-notification" tabindex="-1" data-dialog-title>
-      <%= t("title", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+      <%= t("title", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for_user) %>
     </h3>
     <p id="dialog-desc-budget-modal">
-      <%= t("message", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+      <%= t("message", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for_user) %>
     </p>
   </div>
   <div data-dialog-actions>

data/app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb

@@ -1,3 +1,3 @@
 <div data-remaining-votes-count="true">
-  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_minimum_votes_count_for(current_user)) %>
+  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_minimum_votes_count_for_user) %>
 </div>

data/app/views/decidim/proposals/proposals/_remaining_votes_notification.html.erb

@@ -1,12 +1,12 @@
 <%= alert_box(
   message(
     content_tag(:div, class: "") do
-      concat content_tag(:strong, t("already_vote.title", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
-      concat content_tag(:p, t("already_vote.description", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
+      concat content_tag(:strong, t("already_vote.title", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for_user))
+      concat content_tag(:p, t("already_vote.description", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for_user))
       concat link_to(t("already_vote.see_other_proposals", scope: "decidim.proposals.proposals.voting_rules"), proposals_path, class: "no-modal")
     end
   ),
   :secondary,
   true,
-  { id: "remaining-votes-notification", class: "flash secondary #{"hidden" unless remaining_minimum_votes_count_for(current_user).positive?}" }
+  { id: "remaining-votes-notification", class: "flash secondary #{"hidden" unless remaining_minimum_votes_count_for_user.positive?}" }
 ) %>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -17,7 +17,7 @@
           <% end %>
         <% end %>
       <% else %>
-        <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+        <% if proposal_voted_by_user?(proposal) %>
           <%= action_authorized_button_to(
             :vote,
             proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
@@ -42,7 +42,7 @@
           <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
           <% else %>
-            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+            <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
               <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
               <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>

data/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -1,4 +1,4 @@
-<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user.admin?) %>
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal:, from_proposals_list: true } %>
   <% else %>

data/app/views/decidim/proposals/proposals/_voting_rules.html.erb

@@ -1,31 +1,34 @@
 <% if show_voting_rules? %>
-  <% announcement_body = capture do %>
-    <div class="editor-content">
-      <ul class="mt-0 mb-2">
-        <% if vote_limit_enabled? %>
-          <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
-        <% end %>
+  <div class="item_voting_rules">
+    <%= render partial: "decidim/proposals/proposals/remaining_votes_notification" %>
+    <% announcement_body = capture do %>
+      <div class="editor-content">
+        <ul class="mt-0 mb-2">
+          <% if vote_limit_enabled? %>
+            <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
+          <% end %>
 
-        <% if proposal_limit_enabled? %>
-          <li><%= t(".proposal_limit.description", limit: proposal_limit) %></li>
-        <% end %>
+          <% if proposal_limit_enabled? %>
+            <li><%= t(".proposal_limit.description", limit: proposal_limit) %></li>
+          <% end %>
 
-        <% if threshold_per_proposal_enabled? %>
-          <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
-        <% end %>
+          <% if threshold_per_proposal_enabled? %>
+            <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
+          <% end %>
 
-        <% if can_accumulate_votes_beyond_threshold? %>
-          <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
-        <% end %>
+          <% if can_accumulate_votes_beyond_threshold? %>
+            <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
+          <% end %>
 
-        <% if minimum_votes_per_user_enabled? %>
-          <li>
-            <%= t(".minimum_votes_per_user.description", votes: minimum_votes_per_user) %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
+          <% if minimum_votes_per_user_enabled? %>
+            <li>
+              <%= t(".minimum_votes_per_user.description", votes: minimum_votes_per_user) %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
 
-  <%= cell("decidim/announcement", { title: t(".title"), body: announcement_body }, id: "voting-rules") %>
+    <%= cell("decidim/announcement", { title: t(".title"), body: announcement_body }, id: "voting-rules") %>
+  </div>
 <% end %>

data/app/views/decidim/proposals/proposals/index.html.erb

@@ -43,12 +43,7 @@
   <% end %>
 
   <%= render partial: "decidim/shared/component_announcement" %>
-
-  <% if show_voting_rules? %>
-    <section class="layout-main__section">
-      <%= render partial: "voting_rules" %>
-    </section>
-  <% end %>
+  <%= render partial: "voting_rules" %>
 
   <section id="proposals" class="layout-main__section layout-main__heading">
     <%= render partial: "proposals" %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb

@@ -14,7 +14,7 @@
         <% end %>
       <% end %>
     <% else %>
-      <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+      <% if proposal_voted_by_user?(proposal) %>
         <%= action_authorized_button_to(
           :vote,
           proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
@@ -38,7 +38,7 @@
         <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "column button light button--sc disabled", disabled: true %>
         <% else %>
-          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+          <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "column button light button--sc", disabled: true %>
           <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "column button light button--sc disabled", disabled: true %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb

@@ -12,7 +12,7 @@
       </button>
     <% end %>
   <% else %>
-    <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
+    <% if proposal_voted_by_user?(proposal) %>
       <button type="button" name="button" class="column button success button--sc" id="proposal-<%= proposal.id %>-votes-count">
         <%= proposal.proposal_votes_count || 0 %>
       </button>
@@ -22,7 +22,7 @@
           <%= proposal.proposal_votes_count || 0 %>
         </button>
       <% else %>
-        <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+        <% if vote_limit_enabled? && remaining_votes_count_for_user == 0 %>
           <button type="button" name="button" class="column button button--sc" disabled id="proposal-<%= proposal.id %>-votes-count">
             <%= proposal.proposal_votes_count || 0 %>
           </button>

data/app/views/decidim/proposals/proposals/show.html.erb

@@ -41,7 +41,7 @@ extra_admin_link(
 <%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: component_settings.participatory_texts_enabled? ? main_component_path(current_component) : proposals_path } do %>
 
   <section class="layout-main__section layout-main__heading">
-    <% if show_voting_rules? && remaining_minimum_votes_count_for(current_user).positive? && current_component.participatory_space.can_participate?(current_user) %>
+    <% if show_voting_rules? && remaining_minimum_votes_count_for_user.positive? && current_component.participatory_space.can_participate?(current_user) %>
       <%= render partial: "exit_modal" %>
     <% end %>
 

data/config/locales/ar.yml

@@ -299,6 +299,7 @@ ar:
         title: اقتراحات
       votes:
         object: أصوات
+        title: الأصوات
     participatory_spaces:
       highlighted_proposals:
         see_all: شاهد الكل
@@ -631,7 +632,6 @@ ar:
           text_banner: أنت تتطلع على قائمة الاقتراحات المسحوبة من قبل مؤلفيها. %{go_back_link}.
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها