diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 4021d2fd2..395b6890e 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -214,13 +214,19 @@ class Budget end def should_show_aside? - (budget.selecting? && !unfeasible?) || (budget.balloting? && feasible?) || budget.on_hold? + (budget.selecting? && !unfeasible?) || + (budget.balloting? && feasible?) || + (budget.valuating? && feasible?) end def should_show_votes? budget.selecting? end + def should_show_vote_count? + budget.valuating? + end + def should_show_ballots? budget.balloting? end diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index c9c247784..c9391cbe5 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -46,7 +46,6 @@ <% unless investment.unfeasible? %> <% if investment.should_show_votes? %> -
<%= render partial: '/budgets/investments/votes', locals: { @@ -55,9 +54,17 @@ vote_url: namespaced_budget_investment_vote_path(investment, value: 'yes') } %>
- + <% elsif investment.should_show_vote_count? %> +
+
+ + <%= t("budgets.investments.investment.supports", + count: investment.total_votes) %> + +
+
<% elsif investment.should_show_ballots? %> -
<%= render partial: '/budgets/investments/ballot', locals: { @@ -66,7 +73,6 @@ ballot: ballot } %>
- <% end %> <% end %> diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 12f23fe87..af3c6b194 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -55,11 +55,10 @@ <% if investment.should_show_aside? %>