From dfa71484060126d9c0968966d20a7eecb1d5484a Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 12 Nov 2018 17:23:58 +0100 Subject: [PATCH] Shows unselected message only on balloting or later phase --- .../investments/_investment_show.html.erb | 71 ++++++++++--------- spec/features/budgets/investments_spec.rb | 4 +- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 2f3528653..d5208909a 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -142,42 +142,43 @@ <% end %> - <% else %> - <% if investment.unfeasible? %> -
- <%= t("budgets.investments.show.project_unfeasible_html") %> -
- <% elsif investment.winner? %> -
- <%= t("budgets.investments.show.project_winner") %> -
- <% elsif investment.selected? %> -
- <%= t("budgets.investments.show.project_selected_html") %> -
- <% elsif !investment.selected? %> -
- <%= t("budgets.investments.show.project_not_selected_html") %> -
- <% else %> -
-
- - <%= t("budgets.investments.show.title") %> - - -
- <% end %> - <% if investment.should_show_price? %> - -

<%= t("budgets.investments.show.price") %>

-
-

- <%= investment.formatted_price %> -

-
- <% end %> <% end %> + + <% if investment.unfeasible? %> +
+ <%= t("budgets.investments.show.project_unfeasible_html") %> +
+ <% elsif investment.winner? %> +
+ <%= t("budgets.investments.show.project_winner") %> +
+ <% elsif investment.selected? %> +
+ <%= t("budgets.investments.show.project_selected_html") %> +
+ <% elsif !investment.selected? && @budget.balloting_or_later? %> +
+ <%= t("budgets.investments.show.project_not_selected_html") %> +
+ <% else %> +
+
+ + <%= t("budgets.investments.show.title") %> + + +
+ <% end %> + <% if investment.should_show_price? %> + +

<%= t("budgets.investments.show.price") %>

+
+

+ <%= investment.formatted_price %> +

+
+ <% end %> + <%= render partial: 'shared/social_share', locals: { share_title: t("budgets.investments.show.share"), title: investment.title, diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 6580d9806..5a9798133 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1047,6 +1047,7 @@ feature 'Budget Investments' do end scenario "Show (not selected budget investment)" do + budget.update(phase: 'balloting') user = create(:user) login_as(user) @@ -1055,8 +1056,7 @@ feature 'Budget Investments' do :finished, budget: budget, group: group, - heading: heading, - unfeasibility_explanation: 'Local government is not competent in this matter') + heading: heading) visit budget_investment_path(budget_id: budget.id, id: investment.id)