decidim-proposals 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ce9b11095349492cb56ff878df03491fadfbac
-  data.tar.gz: 715fbd1fb215ae4cc88c246976ff448fc9c9d294
+  metadata.gz: 87d3499da69c46a6b748f61303bf26957d97b788
+  data.tar.gz: f2229325a4b0654b03d37972944712d0a6db353e
 SHA512:
-  metadata.gz: af27be2490906cf7152301e1290f5dc8e76d527d20943602d0ef286ab8b3993f2ba07b7b217046516ca6452c251189e46f4e493d62cec54123303e902afe125a
-  data.tar.gz: 62d8e3020cfc76435472b20356342f0f0e4c1aa32262e92f505fb773488d0f79e65d258884eec9aca52220b3eb4e0dce19889f14a97b302793d6f244ef323170
+  metadata.gz: c8609c5edfe6bc7b87cf7f86b811e94c6c4168b9d9f66a8e473eaf3e6642b182c9f0ce35fe63f42f6a4d99f6b97f6b53b82a0a5278e23149923d94b394863324
+  data.tar.gz: 208b22a99297808ba62e4a3b556948f5c373eb8f87b6b0411b036b27b6eff4daea0dcd7384f19db2bf46b3a190de6b9bf3c592b9437037b64530ad83884beebc

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

@@ -20,6 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
+        return broadcast(:invalid) if proposal_limit_reached?
         return broadcast(:invalid) if form.invalid?
 
         if process_attachments?
@@ -85,6 +86,17 @@ module Decidim
       def process_attachments?
         attachments_allowed? && attachment_present?
       end
+
+      def proposal_limit_reached?
+        proposal_limit = form.current_feature.settings.proposal_limit
+
+        return false if proposal_limit.zero?
+        current_user_proposals.count >= proposal_limit
+      end
+
+      def current_user_proposals
+        Proposal.where(author: @current_user, feature: form.current_feature)
+      end
     end
   end
 end

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

@@ -20,6 +20,8 @@ module Decidim
       #
       # Returns nothing.
       def call
+        return broadcast(:invalid) if @proposal.maximum_votes_reached?
+
         build_proposal_vote
         return broadcast(:invalid) unless vote.valid?
 

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

@@ -8,6 +8,24 @@ module Decidim
     # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
+      helper_method :proposal_limit_reached?
+
+      private
+
+      def proposal_limit
+        return nil if feature_settings.proposal_limit.zero?
+        feature_settings.proposal_limit
+      end
+
+      def proposal_limit_reached?
+        return false unless proposal_limit
+
+        proposals.where(author: current_user).count >= proposal_limit
+      end
+
+      def proposals
+        Proposal.where(feature: current_feature)
+      end
     end
   end
 end

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

@@ -11,8 +11,8 @@ module Decidim
       include Paginable
 
       helper_method :geocoded_proposals
-
       before_action :authenticate_user!, only: [:new, :create]
+      before_action :check_proposal_limit!, only: [:new, :create]
 
       def index
         @proposals = search
@@ -87,6 +87,12 @@ module Decidim
           related_to: ""
         }
       end
+
+      def check_proposal_limit!
+        return unless proposal_limit_reached?
+        flash[:error] = I18n.t("proposals.new.limit_reached", scope: "decidim")
+        redirect_to action: :index
+      end
     end
   end
 end

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

@@ -54,6 +54,20 @@ module Decidim
           "secondary"
         end
       end
+
+      def proposal_limit_enabled?
+        proposal_limit.present?
+      end
+
+      def proposal_limit
+        return if feature_settings.proposal_limit.zero?
+
+        feature_settings.proposal_limit
+      end
+
+      def current_user_proposals
+        Proposal.where(feature: current_feature, author: current_user)
+      end
     end
   end
 end

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

@@ -24,11 +24,55 @@ module Decidim
         "expanded button--sc"
       end
 
+      # Public: Gets the vote limit for each user, if set.
+      #
+      # Returns an Integer if set, nil otherwise.
+      def vote_limit
+        return nil if feature_settings.vote_limit.zero?
+        feature_settings.vote_limit
+      end
+
       # Check if the vote limit is enabled for the current feature
       #
       # Returns true if the vote limit is enabled
       def vote_limit_enabled?
-        current_user && current_settings.votes_enabled? && feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
+        vote_limit.present?
+      end
+
+      # Public: Checks if maximum votes per proposal are set.
+      #
+      # Returns true if set, false otherwise.
+      def maximum_votes_per_proposal_enabled?
+        maximum_votes_per_proposal.present?
+      end
+
+      # Public: Fetches the maximum amount of votes per proposal.
+      #
+      # Returns an Integer with the maximum amount of votes, nil otherwise.
+      def maximum_votes_per_proposal
+        return nil unless feature_settings.maximum_votes_per_proposal.positive?
+        feature_settings.maximum_votes_per_proposal
+      end
+
+      # Public: Checks if voting is enabled in this step.
+      #
+      # Returns true if enabled, false otherwise.
+      def votes_enabled?
+        current_settings.votes_enabled
+      end
+
+      # Public: Checks if voting is blocked in this step.
+      #
+      # Returns true if blocked, false otherwise.
+      def votes_blocked?
+        current_settings.votes_blocked
+      end
+
+      # Public: Checks if the current user is allowed to vote in this step.
+      #
+      # Returns true if the current user can vote, false otherwise.
+      def current_user_can_vote?
+        current_user && votes_enabled? && vote_limit_enabled? && !votes_blocked?
       end
 
       # Return the remaining votes for a user if the current feature has a vote limit

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

@@ -113,6 +113,25 @@ module Decidim
       def official?
         author.nil?
       end
+
+      # Public: The maximum amount of votes allowed for this proposal.
+      #
+      # Returns an Integer with the maximum amount of votes, nil otherwise.
+      def maximum_votes
+        maximum_votes = feature.settings.maximum_votes_per_proposal
+        return nil if maximum_votes.zero?
+
+        maximum_votes
+      end
+
+      # Public: The maximum amount of votes allowed for this proposal. 0 means infinite.
+      #
+      # Returns true if reached, false otherwise.
+      def maximum_votes_reached?
+        return false unless maximum_votes
+
+        votes.count >= maximum_votes
+      end
     end
   end
 end

data/app/services/decidim/proposals/proposal_search.rb

@@ -25,7 +25,7 @@ module Decidim
       def search_origin
         if origin == "official"
           query.where(decidim_author_id: nil)
-        elsif origin == "citizenship"
+        elsif origin == "citizens"
           query.where.not(decidim_author_id: nil)
         else # Assume 'all'
           query

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

@@ -25,7 +25,13 @@
             <% if scopes_enabled?(current_participatory_space) %>
               <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
             <% end %>
+
             <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
+
+            <% if current_settings.votes_enabled? %>
+              <th><%= t("models.proposal.fields.votes", scope: "decidim.proposals") %></th>
+            <% end %>
+
             <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
           </tr>
         </thead>
@@ -57,6 +63,11 @@
                   <%= humanize_proposal_state proposal.state %>
                 </strong>
               </td>
+              <% if current_settings.votes_enabled? %>
+                <td>
+                  <%= proposal.votes.count %>
+                </td>
+              <% end %>
               <td class="table-list__actions">
                 <% if can? :update, proposal %>
                   <%= icon_link_to "chat", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>

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

@@ -13,7 +13,7 @@
   </div>
 
   <% if feature_settings.official_proposals_enabled %>
-    <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizenship", t('.citizenship')]], :first, :last, legend_title: t('.origin') %>
+    <%= form.collection_radio_buttons :origin, [["all", t('.all')], ["official", t('.official')], ["citizens", t('.citizens')]], :first, :last, legend_title: t('.origin') %>
   <% end %>
 
   <% if feature_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>

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

@@ -10,14 +10,16 @@
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
         <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
       <% else %>
-        <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-          <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
-        <% elsif current_settings.votes_blocked? %>
-          <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled>
-            <%= t('.votes_blocked') %>
-          </button>
+        <% if proposal.maximum_votes_reached? %>
+          <%= content_tag :span, t('.maximum_votes_reached'), class: "card__button button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
         <% else %>
-          <%= action_authorized_button_to :vote, t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+          <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+            <%= content_tag :span, t('.no_votes_remaining'), class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+          <% elsif current_settings.votes_blocked? %>
+            <%= content_tag :span, t('.votes_blocked'), class: "card__button button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+          <% else %>
+            <%= action_authorized_button_to :vote, t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+          <% end %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -0,0 +1,35 @@
+<% if votes_enabled? && (vote_limit_enabled? || maximum_votes_per_proposal_enabled? || proposal_limit_enabled?) %>
+  <div class="row column">
+    <div class="callout secondary voting-rules">
+      <div class="row">
+        <div class="columns medium-8 large-9">
+          <h3 class="heading3"><%= t('.title') %></h3>
+          <ul>
+            <% if vote_limit_enabled? %>
+              <li><%= t('.vote_limit.description', limit: feature_settings.vote_limit) %></li>
+            <% end %>
+
+            <% if proposal_limit_enabled? %>
+              <li><%= t('.proposal_limit.description', limit: proposal_limit) %></li>
+            <% end %>
+
+            <% if maximum_votes_per_proposal_enabled? %>
+              <li><%= t('.maximum_votes_per_proposal.description', limit: maximum_votes_per_proposal) %></li>
+            <% end %>
+          </ul>
+        </div>
+        <% if current_user_can_vote? %>
+          <div class="columns medium-4 large-3">
+            <div class="card card--nomargin text-center remaining-votes-counter">
+              <div class="card__content">
+                <span class="definition-data__title"><%= t('.vote_limit.left', limit: feature_settings.vote_limit) %></span>
+                <%= render partial: "remaining_votes_count" %>
+                <span class="extra__suport-text"><%= t('.vote_limit.votes') %></span>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -27,16 +27,20 @@
     <%= javascript_include_tag "decidim/map" %>
   <% end %>
 <% end %>
-<%= render partial: "votes_limit" %>
+<%= render partial: "voting_rules" %>
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
     <% if current_settings.creation_enabled %>
-      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
-        <%= t(".new_proposal") %>
-        <%= icon "plus" %>
+      <% if !proposal_limit_reached? %>
+        <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
+          <%= t(".new_proposal") %>
+          <%= icon "plus" %>
+        <% end %>
+      <% else %>
+        <%= content_tag :a, t(".new_proposal"), class: "title-action__action button small hollow disabled", title: t(".proposal_limit_reached") %>
       <% end %>
     <% else %>
       <span class="title-action__action button small hollow disabled">

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

@@ -4,7 +4,7 @@
   url: proposal_url(@proposal.id)
 }) %>
 
-<%= render partial: "votes_limit" %>
+<%= render partial: "voting_rules" %>
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
@@ -49,14 +49,21 @@
         <div class="section">
           <div class="callout success">
             <h5><%= t(".proposal_accepted_reason") %></h5>
-            <p><%== translated_attribute @proposal.answer %></p>
+            <p><%= sanitize translated_attribute @proposal.answer %></p>
           </div>
         </div>
-      <% else %>
+      <% elsif @proposal.rejected? %>
         <div class="section">
           <div class="callout warning">
             <h5><%= t(".proposal_rejected_reason") %></h5>
-            <p><%== translated_attribute @proposal.answer %></p>
+            <p><%= sanitize translated_attribute @proposal.answer %></p>
+          </div>
+        </div>
+      <% else %>
+        <div class="section">
+          <div class="callout secondary">
+            <h5><%= t(".proposal_in_evaluation_reason") %></h5>
+            <p><%= sanitize translated_attribute @proposal.answer %></p>
           </div>
         </div>
       <% end %>

data/config/locales/ca.yml

@@ -23,10 +23,12 @@ ca:
             attachments_allowed: Permetre arxius adjunts
             comments_enabled: Comentaris habilitats
             geocoding_enabled: Geocodificació habilitada
+            maximum_votes_per_proposal: Vots màxims per proposta
             new_proposal_help_text: Text d'ajuda al crear una nova proposta
             official_proposals_enabled: Propostes oficials habilitades
             proposal_answering_enabled: Resposta oficial a propostes activades
-            vote_limit: Límit de vot
+            proposal_limit: Límit de propostes per usuari
+            vote_limit: Límit de vots per usuari
           step:
             announcement: Avís
             comments_blocked: Comentaris bloquejats
@@ -88,6 +90,9 @@ ca:
             scope: Àmbit
             state: Estat
             title: Títol
+            votes: Vots
+      new:
+        limit_reached: No pots crear noves propostes ja que has superat el límit.
       proposal_votes:
         create:
           error: Hi ha hagut errors en votar la proposta.
@@ -105,7 +110,7 @@ ca:
           all: Tots
           category: Categoria
           category_prompt: Selecciona una categoria
-          citizenship: Ciutadania
+          citizens: Ciutadania
           evaluating: En avaluació
           official: Oficial
           origin: Origen
@@ -123,6 +128,7 @@ ca:
           unfold: Desplegar
         index:
           new_proposal: Nova proposta
+          proposal_limit_reached: Has arribat al límit de la proposta
           view_proposal: Veure proposta
         linked_proposals:
           proposal_votes:
@@ -143,10 +149,12 @@ ca:
           view_proposal: Veure proposta
         show:
           proposal_accepted_reason: 'Aquesta proposta ha estat acceptada perquè:'
+          proposal_in_evaluation_reason: S'està avaluant aquesta proposta
           proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
           report: Informe
         vote_button:
           already_voted: Ja has votat
+          maximum_votes_reached: S'ha arribat al límit de vots
           no_votes_remaining: No hi ha suports restants
           vote: Donar suport
           votes_blocked: Recollida de suports desactivada
@@ -154,12 +162,16 @@ ca:
           count:
             one: SUPORT
             other: SUPORTS
-        votes_limit:
+        voting_rules:
+          maximum_votes_per_proposal:
+            description: Cada proposta pot rebre un màxim de %{limit} vots.
+          proposal_limit:
+            description: Pots crear fins a %{limit} propostes.
+          title: 'La votació es regeix per les següents normes:'
           vote_limit:
-            description: En lloc de donar suport a tantes propostes com es vulgui, només es pot donar suport fins a un màxim de %{limit} propostes.
+            description: Pots votar fins a %{limit} propostes.
             left: Restant
-            title: Té %{limit} suports a distribuir
-            votes: Suports
+            votes: Vots
     resource_links:
       included_proposals:
         proposal_projects: 'Proposta formulada en aquests projectes:'

data/config/locales/en.yml

@@ -23,10 +23,12 @@ en:
             attachments_allowed: Allow attachments
             comments_enabled: Comments enabled
             geocoding_enabled: Geocoding enabled
+            maximum_votes_per_proposal: Maximum votes per proposal
             new_proposal_help_text: New proposal help text
             official_proposals_enabled: Official proposals enabled
             proposal_answering_enabled: Proposal answering enabled
-            vote_limit: Vote limit
+            proposal_limit: Proposal limit per user
+            vote_limit: Vote limit per user
           step:
             announcement: Announcement
             comments_blocked: Comments blocked
@@ -88,6 +90,9 @@ en:
             scope: Scope
             state: State
             title: Title
+            votes: Votes
+      new:
+        limit_reached: You can't create new proposals since you've exceeded the limit.
       proposal_votes:
         create:
           error: There's been errors when voting the proposal.
@@ -105,7 +110,7 @@ en:
           all: All
           category: Category
           category_prompt: Select a category
-          citizenship: Citizenship
+          citizens: Citizens
           evaluating: Evaluating
           official: Official
           origin: Origin
@@ -123,6 +128,7 @@ en:
           unfold: Unfold
         index:
           new_proposal: New proposal
+          proposal_limit_reached: Proposal limit reached
           view_proposal: View proposal
         linked_proposals:
           proposal_votes:
@@ -143,10 +149,12 @@ en:
           view_proposal: View proposal
         show:
           proposal_accepted_reason: 'This proposal has been accepted because:'
+          proposal_in_evaluation_reason: This proposal is being evaluated
           proposal_rejected_reason: 'This proposal has been rejected because:'
           report: Report
         vote_button:
           already_voted: Already voted
+          maximum_votes_reached: Vote limit reached
           no_votes_remaining: No votes remaining
           vote: Vote
           votes_blocked: Voting disabled
@@ -154,11 +162,15 @@ en:
           count:
             one: VOTE
             other: VOTES
-        votes_limit:
+        voting_rules:
+          maximum_votes_per_proposal:
+            description: Each proposal can receive a maximum of %{limit} votes.
+          proposal_limit:
+            description: You can create up to %{limit} proposals.
+          title: 'Voting is subject to the following rules:'
           vote_limit:
-            description: Instead of voting as many proposals as you want you can only vote up to %{limit} proposals.
+            description: You can vote up to %{limit} proposals.
             left: Remaining
-            title: You have %{limit} votes to distribute
             votes: Votes
     resource_links:
       included_proposals:

data/config/locales/es.yml

@@ -23,10 +23,12 @@ es:
             attachments_allowed: Permitir archivos adjuntos
             comments_enabled: Comentarios habilitados
             geocoding_enabled: Geocodificación habilitada
+            maximum_votes_per_proposal: Máximo de votos por propuesta
             new_proposal_help_text: Texto de ayuda al crear una propuesta
             official_proposals_enabled: Propuestas oficiales habilitadas
             proposal_answering_enabled: Respuesta oficial a propuestas habilitadas
-            vote_limit: Límite de votos
+            proposal_limit: Límite de propuestas por usuario
+            vote_limit: Límite de votos por usuario
           step:
             announcement: Aviso
             comments_blocked: Comentarios bloqueados
@@ -88,6 +90,9 @@ es:
             scope: Ámbito
             state: Estado
             title: Título
+            votes: Votos
+      new:
+        limit_reached: No puedes crear nuevas propuestas ya que has superado el límite.
       proposal_votes:
         create:
           error: Ha habido errores al votar la propuesta.
@@ -105,7 +110,7 @@ es:
           all: Todas
           category: Categoría
           category_prompt: Selecciona una categoría
-          citizenship: Ciudadanía
+          citizens: Ciudadanía
           evaluating: En evaluación
           official: Oficial
           origin: Origen
@@ -123,6 +128,7 @@ es:
           unfold: Desplegar
         index:
           new_proposal: Nueva propuesta
+          proposal_limit_reached: Límite de propuestas alcanzado
           view_proposal: Ver propuesta
         linked_proposals:
           proposal_votes:
@@ -143,10 +149,12 @@ es:
           view_proposal: Ver propuesta
         show:
           proposal_accepted_reason: 'Esta propuesta ha sido aceptada porque:'
+          proposal_in_evaluation_reason: Esta propuesta está siendo evaluada
           proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
           report: Denunciar
         vote_button:
           already_voted: Ya votado
+          maximum_votes_reached: Límite de votos alcanzado
           no_votes_remaining: No hay votos restantes
           vote: Dar apoyo
           votes_blocked: Votación desactivada
@@ -154,11 +162,15 @@ es:
           count:
             one: APOYO
             other: APOYOS
-        votes_limit:
+        voting_rules:
+          maximum_votes_per_proposal:
+            description: Cada propuesta puede recibir un máximo de %{limit} votos.
+          proposal_limit:
+            description: Puedes crear hasta %{limit} propuestas.
+          title: 'La votación se rige por las siguientes normas:'
           vote_limit:
-            description: En lugar de dar apoyo tantas propuestas como se desee, sólo se puede dar apoyo hasta %{limit} propuestas.
+            description: Puedes votar hasta %{limit} propuestas.
             left: Restante
-            title: Tiene %{limit} votos a distribuir
             votes: Votos
     resource_links:
       included_proposals: