decidim 0.4.0 → 0.4.1

data/decidim-meetings/spec/features/explore_meetings_spec.rb

@@ -99,6 +99,17 @@ describe "Explore meetings", type: :feature do
         end
       end
     end
+
+    context "when paginating" do
+      before do
+        Decidim::Meetings::Meeting.destroy_all
+      end
+
+      let!(:collection) { create_list :meeting, collection_size, feature: feature }
+      let!(:resource_selector) { ".card--meeting" }
+
+      it_behaves_like "a paginated resource"
+    end
   end
 
   context "show", :serves_map do

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

@@ -8,6 +8,7 @@ module Decidim
       include FormFactory
       include FilterResource
       include Orderable
+      include Paginable
 
       helper_method :geocoded_proposals
 
@@ -30,7 +31,7 @@ module Decidim
                              []
                            end
 
-        @proposals = @proposals.page(params[:page]).per(12)
+        @proposals = paginate(@proposals)
         @proposals = reorder(@proposals)
       end
 

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

@@ -11,7 +11,7 @@ module Decidim
         translatable_attribute :answer, String
         attribute :state, String
 
-        validates :state, presence: true, inclusion: { in: %w(accepted rejected) }
+        validates :state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
       end
     end

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

@@ -17,15 +17,7 @@ module Decidim
       #
       # Returns a String.
       def humanize_proposal_state(state)
-        value = if state == "accepted"
-                  "accepted"
-                elsif state == "rejected"
-                  "rejected"
-                else
-                  "not_answered"
-                end
-
-        I18n.t(value, scope: "decidim.proposals.answers")
+        I18n.t(state, scope: "decidim.proposals.answers", default: :not_answered)
       end
 
       # Public: The css class applied based on the proposal state.
@@ -34,14 +26,34 @@ module Decidim
       #
       # Returns a String.
       def proposal_state_css_class(state)
-        if state == "accepted"
+        case state
+        when "accepted"
           "text-success"
-        elsif state == "rejected"
+        when "rejected"
           "text-alert"
+        when "evaluating"
+          "text-info"
         else
           "text-warning"
         end
       end
+
+      # Public: The css class applied based on the proposal state to
+      #         the proposal badge.
+      #
+      # state - The String state of the proposal.
+      #
+      # Returns a String.
+      def proposal_state_badge_css_class(state)
+        case state
+        when "accepted"
+          "success"
+        when "rejected"
+          "warning"
+        when "evaluating"
+          "secondary"
+        end
+      end
     end
   end
 end

data/decidim-proposals/app/models/decidim/proposals/abilities/{admin_user.rb → admin_ability.rb}

@@ -5,16 +5,9 @@ module Decidim
     module Abilities
       # Defines the abilities related to proposals for a logged in admin user.
       # Intended to be used with `cancancan`.
-      class AdminUser
-        include CanCan::Ability
-
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user && user.role?(:admin)
-
-          @user = user
-          @context = context
+      class AdminAbility < Decidim::Abilities::AdminAbility
+        def define_abilities
+          super
 
           can :manage, Proposal
           can :unreport, Proposal
@@ -26,11 +19,11 @@ module Decidim
         private
 
         def current_settings
-          context.fetch(:current_settings, nil)
+          @context.fetch(:current_settings, nil)
         end
 
         def feature_settings
-          context.fetch(:feature_settings, nil)
+          @context.fetch(:feature_settings, nil)
         end
 
         def can_create_proposal?

data/decidim-proposals/app/models/decidim/proposals/abilities/{current_user.rb → current_user_ability.rb}

@@ -5,7 +5,7 @@ module Decidim
     module Abilities
       # Defines the abilities related to proposals for a logged in user.
       # Intended to be used with `cancancan`.
-      class CurrentUser
+      class CurrentUserAbility
         include CanCan::Ability
 
         attr_reader :user, :context
@@ -27,7 +27,6 @@ module Decidim
           can :create, Proposal if authorized?(:create) && creation_enabled?
 
           can :report, Proposal
-          can :report, Decidim::Comments::Comment
         end
 
         private

data/decidim-proposals/app/models/decidim/proposals/abilities/{process_admin_user.rb → participatory_process_admin_ability.rb}

@@ -5,22 +5,14 @@ module Decidim
     module Abilities
       # Defines the abilities related to proposals for a logged in process admin user.
       # Intended to be used with `cancancan`.
-      class ProcessAdminUser
-        include CanCan::Ability
+      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
+        def define_participatory_process_abilities
+          super
 
-        attr_reader :user, :context
-
-        def initialize(user, context)
-          return unless user && !user.role?(:admin)
-
-          @user = user
-          @context = context
-
-          can :manage, Proposal do |proposal|
-            participatory_processes.include?(proposal.feature.participatory_process)
+          can [:manage, :unreport, :hide], Proposal do |proposal|
+            can_manage_process?(proposal.feature.participatory_process)
           end
-          can :unreport, Proposal
-          can :hide, Proposal
+
           cannot :create, Proposal unless can_create_proposal?
           cannot :update, Proposal unless can_update_proposal?
         end
@@ -28,31 +20,27 @@ module Decidim
         private
 
         def current_settings
-          context.fetch(:current_settings, nil)
+          @context.fetch(:current_settings, nil)
         end
 
         def feature_settings
-          context.fetch(:feature_settings, nil)
+          @context.fetch(:feature_settings, nil)
         end
 
         def current_feature
-          context.fetch(:current_feature, nil)
+          @context.fetch(:current_feature, nil)
         end
 
         def can_create_proposal?
           current_settings.try(:creation_enabled?) &&
             feature_settings.try(:official_proposals_enabled) &&
-            participatory_processes.include?(current_feature.try(:participatory_process))
+            can_manage_process?(current_feature.try(:participatory_process))
         end
 
         def can_update_proposal?
           current_settings.try(:proposal_answering_enabled) &&
             feature_settings.try(:proposal_answering_enabled)
         end
-
-        def participatory_processes
-          @participatory_processes ||= Decidim::Admin::ManageableParticipatoryProcessesForUser.for(@user)
-        end
       end
     end
   end

data/decidim-proposals/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Abilities
+      # Defines the abilities related to proposals for a logged in process admin user.
+      # Intended to be used with `cancancan`.
+      class ParticipatoryProcessModeratorAbility < Decidim::Abilities::ParticipatoryProcessModeratorAbility
+        def define_participatory_process_abilities
+          super
+
+          can [:unreport, :hide], Proposal do |proposal|
+            can_manage_process?(proposal.feature.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,6 +23,7 @@ module Decidim
 
       scope :accepted, -> { where(state: "accepted") }
       scope :rejected, -> { where(state: "rejected") }
+      scope :evaluating, -> { where(state: "evaluating") }
 
       def self.order_randomly(seed)
         transaction do
@@ -67,6 +68,13 @@ module Decidim
         state == "rejected"
       end
 
+      # Public: Checks if the organization has marked the proposal as evaluating it.
+      #
+      # Returns Boolean.
+      def evaluating?
+        state == "evaluating"
+      end
+
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
         feature.settings.comments_enabled?

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

@@ -47,10 +47,13 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        if state == "accepted"
+        case state
+        when "accepted"
           query.accepted
-        elsif state == "rejected"
+        when "rejected"
           query.rejected
+        when "evaluating"
+          query.evaluating
         else # Assume 'all'
           query
         end

data/decidim-proposals/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -6,7 +6,7 @@
 
     <div class="card-section">
       <div class="row column">
-        <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
+        <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')], ["evaluating", t('.evaluating')]], :first, :last, prompt: true %>
       </div>
 
       <div class="row column">

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

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if feature_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
+    <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')], ["evaluating", t('.evaluating')]], :first, :last, legend_title: t('.state') %>
   <% end %>
 
   <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposal_badge.html.erb

@@ -1,3 +1,3 @@
 <% if proposal.answered? %>
-  <span class="<%= (proposal.accepted? ? 'success' : 'warning') %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
+  <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
 <% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -1,4 +1,13 @@
-<%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
+<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
+  <div class="column">
+    <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
+  </div>
+
+  <div class="column">
+    <%= render partial: "decidim/shared/results_per_page" %>
+  </div>
+</div>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>

data/decidim-proposals/config/locales/ca.yml

@@ -48,6 +48,7 @@ ca:
           edit:
             accepted: Acceptada
             answer_proposal: Resposta
+            evaluating: En avaluació
             rejected: Rebutjada
             title: Respondre a la proposta %{title}
         proposals:
@@ -66,6 +67,7 @@ ca:
             title: Crear proposta
       answers:
         accepted: Acceptada
+        evaluating: En avaluació
         not_answered: No resposta
         rejected: Rebutjada
       create:
@@ -97,6 +99,7 @@ ca:
           category: Categoria
           category_prompt: Selecciona una categoria
           citizenship: Ciutadania
+          evaluating: En avaluació
           official: Oficial
           origin: Origen
           rejected: Rebutjades

data/decidim-proposals/config/locales/en.yml

@@ -50,6 +50,7 @@ en:
           edit:
             accepted: Accepted
             answer_proposal: Answer
+            evaluating: Evaluating
             rejected: Rejected
             title: Answer for proposal %{title}
         proposals:
@@ -68,6 +69,7 @@ en:
             title: Create proposal
       answers:
         accepted: Accepted
+        evaluating: Evaluating
         not_answered: Not answered
         rejected: Rejected
       create:
@@ -99,6 +101,7 @@ en:
           category: Category
           category_prompt: Select a category
           citizenship: Citizenship
+          evaluating: Evaluating
           official: Official
           origin: Origin
           rejected: Rejected

data/decidim-proposals/config/locales/es.yml

@@ -48,6 +48,7 @@ es:
           edit:
             accepted: Aceptada
             answer_proposal: Respuesta
+            evaluating: En evaluación
             rejected: Rechazada
             title: Responder a la propuesta %{title}
         proposals:
@@ -66,6 +67,7 @@ es:
             title: Crear propuesta
       answers:
         accepted: Aceptadas
+        evaluating: En evaluación
         not_answered: No contestada
         rejected: Rechazada
       create:
@@ -97,6 +99,7 @@ es:
           category: Categoría
           category_prompt: Selecciona una categoría
           citizenship: Ciudadanía
+          evaluating: En evaluación
           official: Oficial
           origin: Origen
           rejected: Rechazadas

data/decidim-proposals/lib/decidim/proposals/admin_engine.rb

@@ -18,8 +18,11 @@ module Decidim
 
       initializer "decidim_proposals.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.admin_abilities += ["Decidim::Proposals::Abilities::AdminUser"]
-          config.admin_abilities += ["Decidim::Proposals::Abilities::ProcessAdminUser"]
+          config.admin_abilities += [
+            "Decidim::Proposals::Abilities::AdminAbility",
+            "Decidim::Proposals::Abilities::ParticipatoryProcessAdminAbility",
+            "Decidim::Proposals::Abilities::ParticipatoryProcessModeratorAbility"
+          ]
         end
       end
 

data/decidim-proposals/lib/decidim/proposals/engine.rb

@@ -25,7 +25,7 @@ module Decidim
 
       initializer "decidim_proposals.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += ["Decidim::Proposals::Abilities::CurrentUser"]
+          config.abilities += ["Decidim::Proposals::Abilities::CurrentUserAbility"]
         end
       end
     end

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -114,6 +114,10 @@ Decidim.register_feature(:proposals) do |feature|
           proposal.answered_at = Time.current
           proposal.answer = Decidim::Faker::Localized.sentence(10)
           proposal.save!
+        elsif n > 6
+          proposal.state = "evaluating"
+          proposal.answered_at = Time.current
+          proposal.save!
         end
 
         rand(3).times do |m|

data/decidim-proposals/lib/decidim/proposals/proposal_serializer.rb

@@ -21,6 +21,10 @@ module Decidim
             id: @proposal.category.try(:id),
             name: @proposal.category.try(:name)
           },
+          scope: {
+            id: @proposal.scope.try(:id),
+            name: @proposal.scope.try(:name)
+          },
           title: @proposal.title,
           body: @proposal.body,
           votes: @proposal.proposal_votes_count,

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -411,9 +411,9 @@ describe "Proposals", type: :feature do
         visit_feature
 
         expect(page).to have_selector("a", text: "Random")
-        expect(page).to have_selector("#proposals .card-grid .column", count: 2)
-        expect(page).to have_selector("#proposals .card-grid .column", text: lucky_proposal.title)
-        expect(page).to have_selector("#proposals .card-grid .column", text: unlucky_proposal.title)
+        expect(page).to have_selector(".card--proposal", count: 2)
+        expect(page).to have_selector(".card--proposal", text: lucky_proposal.title)
+        expect(page).to have_selector(".card--proposal", text: unlucky_proposal.title)
       end
     end
 
@@ -487,13 +487,13 @@ describe "Proposals", type: :feature do
 
     context "when there are a lot of proposals" do
       before do
-        create_list(:proposal, 17, feature: feature)
+        create_list(:proposal, Decidim::Paginable::OPTIONS.first + 5, feature: feature)
       end
 
       it "paginates them" do
         visit_feature
 
-        expect(page).to have_css(".card--proposal", count: 12)
+        expect(page).to have_css(".card--proposal", count: Decidim::Paginable::OPTIONS.first)
 
         click_link "Next"
 
@@ -751,5 +751,12 @@ describe "Proposals", type: :feature do
         end
       end
     end
+
+    context "when paginating" do
+      let!(:collection) { create_list :proposal, collection_size, feature: feature }
+      let!(:resource_selector) { ".card--proposal" }
+
+      it_behaves_like "a paginated resource"
+    end
   end
 end