decidim 0.0.5 → 0.0.6

data/decidim-admin/spec/forms/participatory_process_step_form_spec.rb

@@ -19,13 +19,6 @@ module Decidim
           ca: "Descripció"
         }
       end
-      let(:short_description) do
-        {
-          en: "Short description",
-          es: "Descripción corta",
-          ca: "Descripció curta"
-        }
-      end
       let(:start_date) {}
       let(:end_date) {}
       let(:attributes) do
@@ -37,9 +30,6 @@ module Decidim
             "description_en" => description[:en],
             "description_es" => description[:es],
             "description_ca" => description[:ca],
-            "short_description_en" => short_description[:en],
-            "short_description_es" => short_description[:es],
-            "short_description_ca" => short_description[:ca],
             "start_date" => start_date,
             "end_date" => end_date,
           }

data/decidim-admin/spec/forms/participatory_process_user_role_form_spec.rb

@@ -5,10 +5,14 @@ module Decidim
   module Admin
     describe ParticipatoryProcessUserRoleForm do
       let(:email) { "my_email@example.org" }
+      let(:name) { "John Wayne" }
+      let(:role) { "admin" }
       let(:attributes) do
         {
           "participatory_process_user_role" => {
             "email" => email,
+            "name" => name,
+            "role" => role
           }
         }
       end

data/decidim-admin/spec/models/abilities/admin_user_spec.rb

@@ -17,6 +17,7 @@ describe Decidim::Admin::Abilities::AdminUser do
 
   it { is_expected.to be_able_to(:manage, Decidim::ParticipatoryProcess) }
   it { is_expected.to be_able_to(:manage, Decidim::ParticipatoryProcessStep) }
+  it { is_expected.to be_able_to(:manage, Decidim::Moderation) }
   it { is_expected.to be_able_to(:manage, Decidim::Attachment) }
   it { is_expected.to be_able_to(:manage, Decidim::Scope) }
   it { is_expected.to be_able_to(:manage, :admin_users) }
@@ -33,8 +34,8 @@ describe Decidim::Admin::Abilities::AdminUser do
   it { is_expected.to be_able_to(:read, Decidim::User) }
   it { is_expected.to be_able_to(:invite, Decidim::User) }
 
-  it { is_expected.to be_able_to(:index, Decidim::UserGroup) }  
-  it { is_expected.to be_able_to(:verify, Decidim::UserGroup) }  
+  it { is_expected.to be_able_to(:index, Decidim::UserGroup) }
+  it { is_expected.to be_able_to(:verify, Decidim::UserGroup) }
 
   context "when a page is a default one" do
     let(:page) { build(:static_page, :default) }

data/decidim-admin/spec/models/abilities/participatory_process_admin_spec.rb

@@ -23,6 +23,10 @@ describe Decidim::Admin::Abilities::ParticipatoryProcessAdmin do
       Decidim::AttachmentUploader.enable_processing = true
       create :attachment, attached_to: unmanaged_process
     end
+    let(:feature) { create(:feature, participatory_process: user_process) }
+    let(:dummy_resource) { create(:dummy_resource, feature: feature) }
+    let(:user_process_moderation) { create(:moderation, reportable: dummy_resource) }
+    let(:unmanaged_process_moderation) { create(:moderation) }
 
     before do
       create :participatory_process_user_role, user: user, participatory_process: user_process
@@ -43,5 +47,8 @@ describe Decidim::Admin::Abilities::ParticipatoryProcessAdmin do
 
     it { is_expected.to be_able_to(:manage, user_process_attachment) }
     it { is_expected.not_to be_able_to(:manage, unmanaged_process_attachment) }
+
+    it { is_expected.to be_able_to(:manage, user_process_moderation) }
+    it { is_expected.not_to be_able_to(:manage, unmanaged_process_moderation) }
   end
 end

data/decidim-admin/spec/queries/process_admins_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Admin::ProcessAdmins do
+  let(:organization) { create :organization }
+  let(:participatory_process) { create :participatory_process, organization: organization}
+  let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
+  let!(:participatory_process_admin) do
+    user = create(:user, :confirmed, organization: organization)
+    Decidim::Admin::ParticipatoryProcessUserRole.create!(
+      role: :admin,
+      user: user,
+      participatory_process: participatory_process
+    )
+    user
+  end
+
+  subject { described_class.new(participatory_process) }
+
+  it "returns the organization admins and participatory process admins" do
+    expect(subject.query).to match_array([admin, participatory_process_admin])
+  end
+end

data/decidim-admin/spec/shared/manage_process_admins_examples.rb

@@ -19,6 +19,8 @@ RSpec.shared_examples "manage process admins examples" do
 
     within "#process_admins form" do
       fill_in :participatory_process_user_role_email, with: other_user.email
+      fill_in :participatory_process_user_role_name, with: "John Doe"
+      select "admin", from: :participatory_process_user_role_role
 
       find("*[type=submit]").click
     end

data/decidim-admin/spec/shared/manage_process_steps_examples.rb

@@ -26,9 +26,6 @@ RSpec.shared_examples "manage process steps examples" do
       expect(page).to have_content(stripped translated(process_step.title, locale: :en))
       expect(page).to have_content(stripped translated(process_step.title, locale: :es))
       expect(page).to have_content(stripped translated(process_step.title, locale: :ca))
-      expect(page).to have_content(stripped translated(process_step.short_description, locale: :en))
-      expect(page).to have_content(stripped translated(process_step.short_description, locale: :es))
-      expect(page).to have_content(stripped translated(process_step.short_description, locale: :ca))
       expect(page).to have_content(stripped translated(process_step.description, locale: :en))
       expect(page).to have_content(stripped translated(process_step.description, locale: :es))
       expect(page).to have_content(stripped translated(process_step.description, locale: :ca))
@@ -46,13 +43,6 @@ RSpec.shared_examples "manage process steps examples" do
         es: "Mi fase de proceso participativo",
         ca: "La meva fase de procés participatiu"
       )
-      fill_in_i18n_editor(
-        :participatory_process_step_short_description,
-        "#short_description-tabs",
-        en: "Short description",
-        es: "Descripción corta",
-        ca: "Descripció curta"
-      )
       fill_in_i18n_editor(
         :participatory_process_step_description,
         "#description-tabs",

data/decidim-api/decidim-api.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
 
   s.add_dependency "rails", *Decidim.rails_version
-  s.add_dependency "graphql", "~> 1.4.2"
+  s.add_dependency "graphql", "~> 1.5.3"
   s.add_dependency "graphiql-rails", "~> 1.4.1"
   s.add_dependency "rack-cors", "~> 0.4.0"
   s.add_dependency "sprockets-es6", "~> 0.9.2"

data/decidim-budgets/app/commands/decidim/budgets/add_line_item.rb

@@ -22,7 +22,7 @@ module Decidim
       # Returns nothing.
       def call
         transaction do
-          return broadcast(:invalid) if order.checked_out?
+          return broadcast(:invalid) if votes_disabled? || order.checked_out?
           add_line_item
           broadcast(:ok, order)
         end
@@ -40,6 +40,14 @@ module Decidim
           order.save!
         end
       end
+
+      def feature
+        @project.feature
+      end
+
+      def votes_disabled?
+        !feature.active_step_settings.votes_enabled?
+      end
     end
   end
 end

data/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -4,7 +4,7 @@ module Decidim
     module Admin
       # This controller allows an admin to manage projects from a Participatory Process
       class ProjectsController < Admin::ApplicationController
-        helper_method :projects
+        helper_method :projects, :finished_orders, :pending_orders
 
         def new
           @form = form(ProjectForm).instance
@@ -60,6 +60,18 @@ module Decidim
           @projects ||= Project.where(feature: current_feature)
         end
 
+        def orders
+          @orders ||= Order.where(feature: current_feature)
+        end
+
+        def pending_orders
+          orders.pending
+        end
+
+        def finished_orders
+          orders.finished
+        end
+
         def project
           @project ||= projects.find(params[:id])
         end

data/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb

@@ -26,12 +26,16 @@ module Decidim
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
         end
 
+        def process_scope
+          current_feature.participatory_process.scope
+        end
+
         def proposals
           @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
         end
 
         def scope
-          @scope ||= context.current_feature.scopes.where(id: decidim_scope_id).first
+          @scope ||= process_scope || current_organization.scopes.where(id: decidim_scope_id).first
         end
 
         def category

data/decidim-budgets/app/models/decidim/budgets/order.rb

@@ -24,6 +24,9 @@ module Decidim
         less_than_or_equal_to: :maximum_budget
       }
 
+      scope :finished, -> { where.not(checked_out_at: nil) }
+      scope :pending, -> { where(checked_out_at: nil) }
+
       # Public: Returns the sum of project budgets
       def total_budget
         projects.to_a.sum(&:budget)

data/decidim-budgets/app/models/decidim/budgets/project.rb

@@ -9,9 +9,12 @@ module Decidim
       include Decidim::HasScope
       include Decidim::HasCategory
       include Decidim::HasAttachments
+      include Decidim::HasReference
       include Decidim::Comments::Commentable
 
       feature_manifest_name "budgets"
+      has_many :line_items, class_name: Decidim::Budgets::LineItem, foreign_key: "decidim_project_id", dependent: :destroy
+      has_many :orders, through: :line_items, foreign_key: "decidim_project_id", class_name: "Decidim::Budgets::Order"
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
@@ -20,13 +23,18 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_votes?` Commentable concern method.
       def comments_have_votes?
         true
       end
+
+      # Public: Returns the number of times an specific project have been checked out.
+      def confirmed_orders_count
+        orders.finished.count
+      end
     end
   end
 end

data/decidim-budgets/app/services/decidim/budgets/project_search.rb

@@ -19,11 +19,6 @@ module Decidim
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
       end
 
-      # Handle the scope_id filter
-      def search_scope_id
-        query.where(decidim_scope_id: scope_id)
-      end
-
       # Returns the random projects for the current page.
       def results
         @projects ||= Project.transaction do

data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -10,9 +10,11 @@
   <%= form.number_field :budget %>
 </div>
 
-<div class="field" >
-  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
-</div>
+<% if !current_participatory_process.scope %>
+  <div class="field" >
+    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+  </div>
+<% end %>
 
 <div class="field" >
   <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -1,5 +1,10 @@
 <h2><%= t(".title") %></h2>
 
+<dl>
+  <dt><%= t ".finished_orders" %>: </dt><dd><%= finished_orders.count %></dd>
+  <dt><%= t ".pending_orders" %>: </dt><dd><%= pending_orders.count %></dd>
+</dl>
+
 <div class="actions title">
   <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_project_path, class: 'new' if can? :manage, current_feature %>
 </div>
@@ -8,6 +13,7 @@
   <thead>
     <tr>
       <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
+      <th class="center"><%= t("index.confirmed_orders_count") %></th>
       <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
     </tr>
   </thead>
@@ -17,6 +23,9 @@
         <td>
           <%= link_to translated_attribute(project.title), decidim_budgets.project_path(id: project, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
         </td>
+        <td class='center'>
+         <%= project.confirmed_orders_count %>
+        </td>
         <td class="actions">
           <%= link_to t("actions.edit", scope: "decidim.budgets"), edit_project_path(project) if can? :update, current_feature %>
           <%= link_to t("actions.attachments", scope: "decidim.budgets"), project_attachments_path(project) if can? :update, current_feature %>

data/decidim-budgets/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -11,6 +11,7 @@ morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/ord
 morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
 
 $("#order-progress").foundation();
+$(".budget-summary__selected").foundation();
 
 if ($projectItem.length > 0) {
   morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');

data/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb

@@ -12,8 +12,8 @@
     </div>
   </div>
 
-  <% if current_organization.scopes.any? %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-budgets/app/views/decidim/budgets/projects/_filters_small_view.html.erb

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/projects/_project.html.erb

@@ -15,18 +15,28 @@
         <span class="card--list__data__number budget-list__number">
           <%= budget_to_currency(project.budget) %>
         </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny budget--list__action success" do %>
           <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
         <% end %>
+        <% if current_settings.show_votes? %>
+          <div class="card__support" style="width: 7em">
+            <span><%= t('.count', count: project.confirmed_orders_count) %></span>
+          </div>
+        <% end %>
       </div>
     <% else %>
       <div class="card--list__data budget-list__data">
         <span class="card--list__data__number budget-list__number">
           <%= budget_to_currency(project.budget) %>
         </span>
-        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
           <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
         <% end %>
+        <% if current_settings.show_votes? %>
+          <div class="card__support" style="width: 7em">
+            <span><%= t('.count', count: project.confirmed_orders_count) %></span>
+          </div>
+        <% end %>
       </div>
     <% end %>
   <% else %>
@@ -37,6 +47,11 @@
       <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
         <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
       </a>
+      <% if current_settings.show_votes? %>
+        <div class="card__support" style="width: 7em">
+          <span><%= t('.count', count: project.confirmed_orders_count) %></span>
+        </div>
+      <% end %>
     </div>
   <% end %>
 </div>

data/decidim-budgets/app/views/decidim/budgets/projects/_project_budget_button.html.erb

@@ -1,8 +1,8 @@
 <% if current_user.present? %>
   <% if current_order && current_order.projects.include?(project) %>
-    <%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
   <% else %>
-    <%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
   <% end %>
 <% else %>
   <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t('.add') %></button>

data/decidim-budgets/app/views/decidim/budgets/projects/_tags.html.erb

@@ -3,7 +3,7 @@
     <% if project.category.present? %>
       <li><%= link_to translated_attribute(project.category.name), decidim_budgets.projects_path(filter: { category_id: project.category.id }) %></li>
     <% end %>
-    <% if project.scope.present? %>
+    <% if project.scope.present? && !current_participatory_process.scope %>
       <li><%= link_to project.scope.name, decidim_budgets.projects_path(filter: { scope_id: [project.scope.id] }) %></li>
     <% end %>
   </ul>

data/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb

@@ -1,4 +1,4 @@
-<% if current_user.present? %>
+<% if current_user.present? && current_settings.votes_enabled? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>
   </div>
@@ -10,6 +10,7 @@
 </div>
 <div class="row">
   <div class="columns mediumlarge-4 large-3">
+    <%= render partial: "filters_small_view"%>
     <div class="card card--secondary show-for-mediumlarge" >
       <%= render partial: "filters" %>
     </div>