From f722caac242e20c62fbaaece9af632f39feae13c Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 19 Jan 2018 13:29:04 +0100 Subject: [PATCH] removes budget steps on header --- app/models/budget/phase.rb | 4 ---- app/views/budgets/index.html.erb | 3 +-- spec/features/budgets/budgets_spec.rb | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 61f778678..5475d97be 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -55,10 +55,6 @@ class Budget end end - def step_number - budget.published_phases.index(self) + 1 || 0 - end - private def prev_phase_dates_valid? diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 345731170..01ce04f93 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -16,8 +16,7 @@

- <% steps = "(#{@budget.current_phase.step_number}/#{@budget.published_phases.count})" %> - <%= t('budgets.show.phase') %> <%= steps %> + <%= t('budgets.show.phase') %>

<%= t("budgets.phase.#{@budget.phase}") %>

diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb index c59fed2f8..71e0b9a4a 100644 --- a/spec/features/budgets/budgets_spec.rb +++ b/spec/features/budgets/budgets_spec.rb @@ -19,7 +19,7 @@ feature 'Budgets' do within("#budget_heading") do expect(page).to have_content(last_budget.name) expect(page).to have_content(last_budget.description) - expect(page).to have_content("Actual phase (1/8)") + expect(page).to have_content("Actual phase") expect(page).to have_content("Accepting projects") expect(page).to have_link 'Help about participatory budgets' expect(page).to have_link 'See all phases' @@ -29,7 +29,7 @@ feature 'Budgets' do visit budgets_path within("#budget_heading") do - expect(page).to have_content("Actual phase (5/8)") + expect(page).to have_content("Actual phase") end within('#budget_info') do