removes budget steps on header
This commit is contained in:
@@ -55,10 +55,6 @@ class Budget
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def step_number
|
|
||||||
budget.published_phases.index(self) + 1 || 0
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def prev_phase_dates_valid?
|
def prev_phase_dates_valid?
|
||||||
|
|||||||
@@ -16,8 +16,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="small-12 medium-3 column info padding" data-equalizer-watch>
|
<div class="small-12 medium-3 column info padding" data-equalizer-watch>
|
||||||
<p>
|
<p>
|
||||||
<% steps = "(#{@budget.current_phase.step_number}/#{@budget.published_phases.count})" %>
|
<strong><%= t('budgets.show.phase') %></strong>
|
||||||
<strong><%= t('budgets.show.phase') %> <%= steps %></strong>
|
|
||||||
</p>
|
</p>
|
||||||
<h2><%= t("budgets.phase.#{@budget.phase}") %></h2>
|
<h2><%= t("budgets.phase.#{@budget.phase}") %></h2>
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ feature 'Budgets' do
|
|||||||
within("#budget_heading") do
|
within("#budget_heading") do
|
||||||
expect(page).to have_content(last_budget.name)
|
expect(page).to have_content(last_budget.name)
|
||||||
expect(page).to have_content(last_budget.description)
|
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_content("Accepting projects")
|
||||||
expect(page).to have_link 'Help about participatory budgets'
|
expect(page).to have_link 'Help about participatory budgets'
|
||||||
expect(page).to have_link 'See all phases'
|
expect(page).to have_link 'See all phases'
|
||||||
@@ -29,7 +29,7 @@ feature 'Budgets' do
|
|||||||
visit budgets_path
|
visit budgets_path
|
||||||
|
|
||||||
within("#budget_heading") do
|
within("#budget_heading") do
|
||||||
expect(page).to have_content("Actual phase (5/8)")
|
expect(page).to have_content("Actual phase")
|
||||||
end
|
end
|
||||||
|
|
||||||
within('#budget_info') do
|
within('#budget_info') do
|
||||||
|
|||||||
Reference in New Issue
Block a user