diff --git a/app/models/budget.rb b/app/models/budget.rb index 5d24e2437..8457ba1ac 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -41,7 +41,7 @@ class Budget < ActiveRecord::Base end def published_phases - phases.published + phases.published.order(:id) end def description diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 87a3909a0..61f778678 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -56,7 +56,7 @@ class Budget end def step_number - budget.published_phases.order(:id).index(self) + 1 || 0 + budget.published_phases.index(self) + 1 || 0 end private diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index b8e057a2f..ef94c423d 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -16,8 +16,8 @@

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

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