From 5d38e4702f9e35bc009eccaeea81597095e6bdd7 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Thu, 30 Apr 2020 10:38:15 +0700 Subject: [PATCH] Adjust default budget filter Apart from 'balloting', there are more phases between 'publishing_prices' and 'finished'. So, it doesn't make sense that the filter 'selected' is only applied to those two. With this change the filter will be applied as follow: 'not_unfeasible' for phases: - informing - accepting - reviewing - selecting - valuating selected for phases: - publishing_prices - balloting - reviewing_ballots winners for phases: - finished --- app/controllers/concerns/investment_filters.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/investment_filters.rb b/app/controllers/concerns/investment_filters.rb index b09eff44d..6b4cfb8f9 100644 --- a/app/controllers/concerns/investment_filters.rb +++ b/app/controllers/concerns/investment_filters.rb @@ -8,10 +8,10 @@ module InvestmentFilters end def set_default_investment_filter - if @budget&.balloting? || @budget&.publishing_prices? - params[:filter] ||= "selected" - elsif @budget&.finished? + if @budget&.finished? params[:filter] ||= "winners" + elsif @budget&.publishing_prices_or_later? + params[:filter] ||= "selected" end end end