consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Valuation Investment index heading filters

Browse Source 
Why:

Heading filter where not being correctly displayed

How:

Increasing scenario to cover all possible combinations, and fixing the
heading_filters method of the Valuation Budget Investment Controller to
correctly:
  * Find how many investments the valuator can access
  * Count investments for each heading
This commit is contained in:
Bertocq
2018-03-13 19:58:40 +01:00
committed by decabeza
parent 06831f4fc9
commit 3e75bd4dfd
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/valuation/budget_investments_controller.rb
View File

@@ -73,7 +73,9 @@ class Valuation::BudgetInvestmentsController < Valuation::BaseController
end end
def heading_filters def heading_filters
investments = @budget.investments.by_valuator(current_user.valuator.try(:id)).distinct investments = @budget.investments.by_valuator(current_user.valuator.try(:id))
.visible_to_valuators.distinct
investment_headings = Budget::Heading.where(id: investments.pluck(:heading_id).uniq) investment_headings = Budget::Heading.where(id: investments.pluck(:heading_id).uniq)
.order(name: :asc) .order(name: :asc)

36
spec/features/valuation/budget_investments_spec.rb
View File

@@ -93,25 +93,25 @@ feature 'Valuation budget investments' do
valuating_finished_heading = create(:budget_heading, name: "Valuating&Finished", group: group) valuating_finished_heading = create(:budget_heading, name: "Valuating&Finished", group: group)
finished_heading = create(:budget_heading, name: "Only Finished", group: group) finished_heading = create(:budget_heading, name: "Only Finished", group: group)
create(:budget_investment, :visible_to_valuators, title: "Valuating Investment ONE", create(:budget_investment, :visible_to_valuators, title: "Valuating Investment ONE",
heading: valuating_heading, heading: valuating_heading,
group: group, group: group,
budget: budget, budget: budget,
valuators: [valuator]) valuators: [valuator])
create(:budget_investment, :visible_to_valuators, title: "Valuating Investment TWO", create(:budget_investment, :visible_to_valuators, title: "Valuating Investment TWO",
heading: valuating_finished_heading, heading: valuating_finished_heading,
group: group, group: group,
budget: budget, budget: budget,
valuators: [valuator]) valuators: [valuator])
create(:budget_investment, :finished, :visible_to_valuators, title: "Finished ONE", create(:budget_investment, :visible_to_valuators, :finished, title: "Finished ONE",
heading: valuating_finished_heading, heading: valuating_finished_heading,
group: group, group: group,
budget: budget, budget: budget,
valuators: [valuator]) valuators: [valuator])
create(:budget_investment, :finished, :visible_to_valuators, title: "Finished TWO", create(:budget_investment, :visible_to_valuators, :finished, title: "Finished TWO",
heading: finished_heading, heading: finished_heading,
group: group, group: group,
budget: budget, budget: budget,
valuators: [valuator]) valuators: [valuator])
visit valuation_budget_budget_investments_path(budget) visit valuation_budget_budget_investments_path(budget)