decidim 0.0.4 → 0.0.5

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

@@ -15,6 +15,14 @@ describe Decidim::Admin::ManageableParticipatoryProcessesForUser do
     end
   end
 
+  context "when the user is a collaborator" do
+    let(:user) { create :user, :collaborator }
+
+    it "returns only the organization processes" do
+      expect(subject.query).to eq [organization_process]
+    end
+  end
+
   context "when the user is not an admin" do
     let(:user) { create :user }
     let!(:organization_process2) { create :participatory_process, organization: user.organization }

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

@@ -75,12 +75,8 @@ RSpec.shared_examples "manage processes examples" do
       expect(page).to have_content("successfully")
     end
 
-    within "table" do
+    within ".tabs-content" do
       expect(page).to have_content("My new title")
-      click_link("My new title")
-    end
-
-    within "dl" do
       expect(page).not_to have_css("img[src*='#{image2_filename}']")
       expect(page).to have_css("img[src*='#{image3_filename}']")
     end

data/decidim-api/lib/decidim/api.rb

@@ -5,13 +5,8 @@ module Decidim
   # This module holds all business logic related to exposing a Public API for
   # decidim.
   module Api
-    autoload :MutationType, "decidim/api/types/mutation"
-    autoload :QueryType, "decidim/api/types/query"
-    autoload :AuthorInterface, "decidim/api/types/author_interface"
-
-    autoload :TranslatedFieldType, "decidim/api/types/translated_field"
-    autoload :LocalizedStringType, "decidim/api/types/localized_string"
-
+    autoload :MutationType, "decidim/api/mutation_type"
+    autoload :QueryType, "decidim/api/query_type"
     autoload :Schema, "decidim/api/schema"
   end
 end

data/decidim-budgets/app/assets/javascripts/decidim/budgets/projects.js.es6

@@ -6,7 +6,7 @@ $(() => {
   const $budgetSummaryTotal = $('.budget-summary__total');
   const $budgetExceedModal = $('#budget-excess');
 
-  const totalBudget = $budgetSummaryTotal.data('total-budget');
+  const totalBudget = parseInt($budgetSummaryTotal.attr('data-total-budget'), 10);
 
   const cancelEvent = (event) => {
     event.stopPropagation();
@@ -14,14 +14,14 @@ $(() => {
   };
 
   $projects.on('click', '.budget--list__action', (event) => {
-    const currentBudget = $('.budget-summary__progressbox').data('current-budget');
+    const currentBudget = parseInt($('.budget-summary__progressbox').attr('data-current-budget'), 10);
     const $currentTarget = $(event.currentTarget);
-    const projectBudget = $currentTarget.data('budget');
+    const projectBudget = parseInt($currentTarget.attr('data-budget'), 10);
 
     if ($currentTarget.attr('disabled')) {
       cancelEvent(event);
 
-    } else if ($currentTarget.data('add') && ((currentBudget + projectBudget) > totalBudget)) {
+    } else if ($currentTarget.attr('data-add') && ((currentBudget + projectBudget) > totalBudget)) {
       $budgetExceedModal.foundation('toggle');
       cancelEvent(event);
     }

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

@@ -35,8 +35,10 @@ module Decidim
       end
 
       def add_line_item
-        order.projects << @project
-        order.save!
+        order.with_lock do
+          order.projects << @project
+          order.save!
+        end
       end
     end
   end

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

@@ -19,15 +19,19 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) unless @order&.can_checkout?
-        checkout!
+        return broadcast(:invalid, @order) unless checkout!
         broadcast(:ok, @order)
       end
 
       private
 
       def checkout!
-        @order.update_attributes!(checked_out_at: Time.current)
+        return unless @order
+
+        @order.with_lock do
+          @order.checked_out_at = Time.current
+          @order.save
+        end
       end
     end
   end

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

@@ -16,9 +16,17 @@ module Decidim
       validates :user, presence: true, uniqueness: { scope: :feature }
       validate :user_belongs_to_organization
 
+      validates :total_budget, numericality: {
+        greater_than_or_equal_to: :minimum_budget
+      }, if: :checked_out?
+
+      validates :total_budget, numericality: {
+        less_than_or_equal_to: :maximum_budget
+      }
+
       # Public: Returns the sum of project budgets
       def total_budget
-        @total_budget ||= projects.sum(&:budget)
+        projects.to_a.sum(&:budget)
       end
 
       # Public: Returns true if the order has been checked out
@@ -38,9 +46,16 @@ module Decidim
 
       # Public: Returns the required minimum budget to checkout
       def minimum_budget
+        return 0 unless feature
         feature.settings.total_budget.to_f * (feature.settings.vote_threshold_percent.to_f / 100)
       end
 
+      # Public: Returns the required maximum budget to checkout
+      def maximum_budget
+        return 0 unless feature
+        feature.settings.total_budget.to_f
+      end
+
       private
 
       def user_belongs_to_organization

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

@@ -9,8 +9,24 @@ module Decidim
       include Decidim::HasScope
       include Decidim::HasCategory
       include Decidim::HasAttachments
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "budgets"
+
+      # Public: Overrides the `commentable?` Commentable concern method.
+      def commentable?
+        feature.settings.comments_enabled?
+      end
+
+      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      def accepts_new_comments?
+         commentable? && !feature.active_step_settings.comments_blocked
+      end
+
+      # Public: Overrides the `comments_have_votes?` Commentable concern method.
+      def comments_have_votes?
+        true
+      end
     end
   end
 end

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

@@ -5,19 +5,19 @@ var $projectItem = $('#project-<%= project.id %>-item');
 var $projectBudgetButton = $('#project-<%= project.id %>-budget-button');
 var $budgetConfirm = $('#budget-confirm');
 
-$orderTotalBudget.html('<%= j(render partial: 'decidim/budgets/projects/order_total_budget') %>');
-$orderSelectedProjects.html('<%= j(render partial: 'decidim/budgets/projects/order_selected_projects') %>');
-$orderProgress.html('<%= j(render partial: 'decidim/budgets/projects/order_progress') %>');
-$budgetConfirm.html('<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
+morphdom($orderTotalBudget[0], '<%= j(render partial: 'decidim/budgets/projects/order_total_budget') %>');
+morphdom($orderSelectedProjects[0], '<%= j(render partial: 'decidim/budgets/projects/order_selected_projects') %>');
+morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/order_progress') %>');
+morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
 
-$(document).foundation();
+$("#order-progress").foundation();
 
 if ($projectItem.length > 0) {
-  $projectItem.html('<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');
+  morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');
 }
 
 if ($projectBudgetButton.length > 0) {
-  $projectBudgetButton.html('<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
+  morphdom($projectBudgetButton[0], '<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
 }
 
 window.DecidimBudgets.checkProgressPosition();

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

@@ -1,30 +1,32 @@
-<% if current_order.present? %>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t('.title') %></h3>
-    <button class="close-button" data-close aria-label="<%= t('.cancel') %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <p><%= t('.description') %></p>
-  <div class="card card--secondary">
-    <ul class="card__content">
-      <% current_order.projects.each do |project| %>
-        <li class="budget-summary__selected-item">
-          <%= link_to translated_attribute(project.title), project %>
-          <strong class="budget-summary__selected-number">
-            <%= budget_to_currency project.budget %>
-          </strong>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-  <p class="text-center"><%= t('.are_you_sure') %></p>
+<div class="reveal" data-reveal id="budget-confirm">
+  <% if current_order.present? %>
+    <div class="reveal__header">
+      <h3 class="reveal__title"><%= t('.title') %></h3>
+      <button class="close-button" data-close aria-label="<%= t('.cancel') %>" type="button">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+    <p><%= t('.description') %></p>
+    <div class="card card--secondary">
+      <ul class="card__content">
+        <% current_order.projects.each do |project| %>
+          <li class="budget-summary__selected-item">
+            <%= link_to translated_attribute(project.title), project %>
+            <strong class="budget-summary__selected-number">
+              <%= budget_to_currency project.budget %>
+            </strong>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+    <p class="text-center"><%= t('.are_you_sure') %></p>
     <div class="row">
       <div class="columns medium-8 medium-offset-2">
         <%= button_to t('.confirm'), checkout_order_path, class: "button expanded" %>
       </div>
     </div>
-  <div class="text-center">
-    <button class="link" data-close><%= t('.cancel') %></button>
-  </div>
-<% end %>
+    <div class="text-center">
+      <button class="link" data-close><%= t('.cancel') %></button>
+    </div>
+  <% end %>
+</div>

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

@@ -20,27 +20,18 @@
       </span>
     </div>
 
-    <div id="order-progress">
-      <%= render partial: 'order_progress' %>
-    </div>
+    <%= render partial: 'order_progress' %>
 
     <div>
       <span class="mini-title">
         <%= t('.assigned') %>
-        <strong id="order-total-budget" class="mini-title__strong">
-          <%= render partial: 'order_total_budget' %>
-        </strong>
+        <%= render partial: 'order_total_budget' %>
       </span>
     </div>
   </div>
 
-  <div id="order-selected-projects">
-    <%= render partial: 'order_selected_projects' %>
-  </div>
+  <%= render partial: 'order_selected_projects' %>
 </div>
 
 <%= render partial: "budget_excess" %>
-
-<div class="reveal" data-reveal id="budget-confirm">
-  <%= render partial: "budget_confirm" %>
-</div>
+<%= render partial: "budget_confirm" %>

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

@@ -1,24 +1,8 @@
-<div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
-  <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-    <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
-    <!--Change width and text dynamically.-->
-    <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-      <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
-    </div>
-  </div>
-  <% unless current_order_checked_out? %>
-    <% if current_order_can_be_checked_out? %>
-      <button class="button small button--sc" data-toggle="budget-confirm"><%= t('.vote') %></button>
-    <% else %>
-      <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t('.vote') %></button>
-    <% end %>
-  <% end %>
-</div>
-
-<div class="progressbox-fixed-wrapper" data-progressbox-fixed>
-  <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
-    <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
+<div id="order-progress">
+  <div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
+    <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
       <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+      <!--Change width and text dynamically.-->
       <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
         <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
       </div>
@@ -31,4 +15,22 @@
       <% end %>
     <% end %>
   </div>
-</div>
+
+  <div class="progressbox-fixed-wrapper" data-progressbox-fixed>
+    <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
+      <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
+        <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+        <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
+          <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+        </div>
+      </div>
+      <% unless current_order_checked_out? %>
+        <% if current_order_can_be_checked_out? %>
+          <button class="button small button--sc" data-toggle="budget-confirm"><%= t('.vote') %></button>
+        <% else %>
+          <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t('.vote') %></button>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -1,25 +1,27 @@
-<% if current_order&.projects&.any? %>
-  <div class="card__content budget-summary__selected">
-    <button data-toggle="reveal-selected">
-      <strong><%= current_order.projects.size %> </strong><%= t('.selected_projects', count: current_order.projects.size) %>
-      <%= icon("caret-bottom", class:"icon--small", aria_label: t('.view'), role: "img") %>
-    </button>
-    <div id="reveal-selected" class="hide" data-toggler=".hide">
-      <ul class="budget-summary__selected-list">
-        <% current_order.projects.each do |project| %>
-          <li class="budget-summary__selected-item">
-            <%= link_to translated_attribute(project.title), project %>
-            <strong class="budget-summary__selected-number">
-              <%= budget_to_currency project.budget %>
-            </strong>
-            <% unless current_order_checked_out? %>
-              <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
-                <%= icon("trash", aria_label: t('.remove'), role: "img") %>
+<div id="order-selected-projects">
+  <% if current_order&.projects&.any? %>
+    <div class="card__content budget-summary__selected">
+      <button data-toggle="reveal-selected">
+        <strong><%= current_order.projects.size %> </strong><%= t('.selected_projects', count: current_order.projects.size) %>
+        <%= icon("caret-bottom", class:"icon--small", aria_label: t('.view'), role: "img") %>
+      </button>
+      <div id="reveal-selected" class="hide" data-toggler=".hide">
+        <ul class="budget-summary__selected-list">
+          <% current_order.projects.each do |project| %>
+            <li class="budget-summary__selected-item">
+              <%= link_to translated_attribute(project.title), project %>
+              <strong class="budget-summary__selected-number">
+                <%= budget_to_currency project.budget %>
+              </strong>
+              <% unless current_order_checked_out? %>
+                <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
+                  <%= icon("trash", aria_label: t('.remove'), role: "img") %>
+                <% end %>
               <% end %>
-            <% end %>
-          </li>
-        <% end %>
-      </ul>
+            </li>
+          <% end %>
+        </ul>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1 +1,3 @@
-<%= budget_to_currency current_order&.total_budget.to_f %>
+<strong id="order-total-budget" class="mini-title__strong">
+  <%= budget_to_currency current_order&.total_budget.to_f %>
+</strong>

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

@@ -1,40 +1,42 @@
-<div class="card--list__text">
-  <div>
-    <%= link_to project, class: "card__link" do %>
-      <h5 class="card__title budget-list__title">
-        <%= translated_attribute project.title %>
-      </h5>
-    <% end %>
-    <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
-  </div>
-</div>
-<% if current_user.present? %>
-  <% if current_order && current_order.projects.include?(project) %>
-    <div class="card--list__data budget-list__data budget-list__data--added">
-      <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 %>
-        <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
+<div id="project-<%= project.id %>-item" class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <%= link_to project, class: "card__link" do %>
+        <h5 class="card__title budget-list__title">
+          <%= translated_attribute project.title %>
+        </h5>
       <% end %>
+      <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
     </div>
+  </div>
+  <% if current_user.present? %>
+    <% if current_order && current_order.projects.include?(project) %>
+      <div class="card--list__data budget-list__data budget-list__data--added">
+        <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 %>
+          <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
+        <% 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 %>
+          <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
+        <% end %>
+      </div>
+    <% end %>
   <% 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 %>
+      <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
         <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
-      <% end %>
+      </a>
     </div>
   <% end %>
-<% else %>
-  <div class="card--list__data budget-list__data">
-    <span class="card--list__data__number budget-list__number">
-      <%= budget_to_currency(project.budget) %>
-    </span>
-    <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>
-  </div>
-<% end %>
+</div>