Merge pull request consuldemocracy#1404 from AyuntamientoMadrid/upstream

Upstream

Gemfile.lock

@@ -243,7 +243,7 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -344,8 +344,8 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     railties (4.2.10)
       actionpack (= 4.2.10)
       activesupport (= 4.2.10)

app/controllers/admin/budget_investments_controller.rb

@@ -9,8 +9,6 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
                  valuation_finished winners},
                  only: [:index, :toggle_selection])
 
-  has_orders %w{oldest}, only: [:show, :edit]
-
   before_action :load_budget
   before_action :load_investment, only: [:show, :edit, :update, :toggle_selection]
   before_action :load_ballot, only: [:show, :index]

app/controllers/users/registrations_controller.rb

@@ -73,6 +73,10 @@ def configure_permitted_parameters
       devise_parameter_sanitizer.for(:account_update).push(:email)
     end
 
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.for(:account_update).push(:email)
+    end
+
     def erase_params
       params.require(:user).permit(:erase_reason)
     end

app/helpers/valuation_helper.rb

@@ -13,6 +13,11 @@ def valuator_group_select_options
     ValuatorGroup.order("name ASC").collect { |g| [ g.name, "group_#{g.id}"] }
   end
 
+  def assigned_valuators(investment)
+    [investment.valuator_groups.collect(&:name) +
+     investment.valuators.collect(&:description_or_name)].flatten.join(', ')
+  end
+
   def assigned_valuators_info(valuators)
     case valuators.size
     when 0

app/models/abilities/valuator.rb

@@ -12,6 +12,7 @@ def initialize(user)
       valuator = user.valuator
 
       can [:read], SpendingProposal
+
       can [:read, :update, :comment_valuation], Budget::Investment, id: valuator.assigned_investment_ids
       can [:valuate], Budget::Investment, { id: valuator.assigned_investment_ids, valuation_finished: false }
       cannot [:update, :valuate, :comment_valuation], Budget::Investment, budget: { phase: 'finished' }

app/views/admin/budget_investments/index.html.erb

@@ -1,7 +1,6 @@
 <h2 class="inline-block"><%= @budget.name %> - <%= t("admin.budget_investments.index.title") %></h2>
 
 <%= render "search_form" %>
-
 <%= render "/shared/filter_subnav", i18n_namespace: "admin.budget_investments.index" %>
 
 <div id="investments">

config/locales/en/admin.yml

@@ -231,6 +231,7 @@ en:
         documents: "Documents"
         see_documents: "See documents (%{count})"
         no_documents: "Without documents"
+        valuator_groups: "Valuator Groups"
       edit:
         classification: Classification
         compatibility: Compatibility

config/locales/es/admin.yml

@@ -231,6 +231,7 @@ es:
         documents: "Documentos"
         see_documents: "Ver documentos (%{count})"
         no_documents: "Sin documentos"
+        valuator_groups: "Grupos de evaluadores"
       edit:
         classification: Clasificación
         compatibility: Compatibilidad

spec/features/admin/budget_investments_spec.rb

@@ -119,6 +119,33 @@
       end
     end
 
+    scenario 'Display valuator group assignments' do
+      budget_investment1 = create(:budget_investment, budget: budget)
+      budget_investment2 = create(:budget_investment, budget: budget)
+      budget_investment3 = create(:budget_investment, budget: budget)
+
+      health_group = create(:valuator_group, name: "Health")
+      culture_group = create(:valuator_group, name: "Culture")
+
+      budget_investment1.valuator_groups << health_group
+      budget_investment2.valuator_group_ids = [health_group.id, culture_group.id]
+
+      visit admin_budget_budget_investments_path(budget_id: budget)
+
+      within("#budget_investment_#{budget_investment1.id}") do
+        expect(page).to have_content("Health")
+      end
+
+      within("#budget_investment_#{budget_investment2.id}") do
+        expect(page).to have_content("Health")
+        expect(page).to have_content("Culture")
+      end
+
+      within("#budget_investment_#{budget_investment3.id}") do
+        expect(page).to have_content("No valuators assigned")
+      end
+    end
+
     scenario "Filtering by budget heading", :js do
       group1 = create(:budget_group, name: "Streets", budget: budget)
       group2 = create(:budget_group, name: "Parks", budget: budget)
@@ -237,6 +264,7 @@
 
       select "Valuator 1", from: "valuator_or_group_id"
       click_button 'Filter'
+
       expect(page).to have_content('There is 1 investment')
       expect(page).not_to have_link("Destroy the city")
       expect(page).to have_link("Realocate visitors")
@@ -253,7 +281,8 @@
       budget_investment2 = create(:budget_investment, title: "Build a theatre", budget: budget)
       budget_investment2.valuator_groups << culture_group
 
-      visit admin_budget_budget_investments_path(budget_id: budget.id)
+      visit admin_budget_budget_investments_path(budget_id: budget)
+
       expect(page).to have_link("Build a hospital")
       expect(page).to have_link("Build a theatre")