diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb index e3b74ca65..b6adc0a0a 100644 --- a/app/controllers/admin/budgets_controller.rb +++ b/app/controllers/admin/budgets_controller.rb @@ -4,7 +4,7 @@ class Admin::BudgetsController < Admin::BaseController include FeatureFlags feature_flag :budgets - has_filters %w[open finished], only: :index + has_filters %w[all open finished], only: :index before_action :load_budget, except: [:index, :new, :create] before_action :load_staff, only: [:new, :create, :edit, :update, :show] diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index ddaafb641..22332f663 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -70,6 +70,7 @@ en: new_link: Create new budget filter: Filter filters: + all: All open: Open finished: Finished help: "Participatory budgets allow citizens to propose and decide directly how to spend part of the budget, with monitoring and rigorous evaluation of proposals by the institution." diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 8afb17164..252705474 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -70,6 +70,7 @@ es: new_link: Crear nuevo presupuesto filter: Filtro filters: + all: Todos open: Abiertos finished: Terminados help: "Los presupuestos participativos permiten que los ciudadanos propongan y decidan de manera directa cómo gastar parte del presupuesto, con un seguimiento y evaluación riguroso de las propuestas por parte de la institución." diff --git a/spec/system/admin/budgets_spec.rb b/spec/system/admin/budgets_spec.rb index 3303084aa..ad2a9e2f0 100644 --- a/spec/system/admin/budgets_spec.rb +++ b/spec/system/admin/budgets_spec.rb @@ -77,15 +77,15 @@ describe "Admin budgets", :admin do expect(page).not_to have_content(finished_budget.name) end - scenario "Open filter is properly highlighted" do - filters_links = { "current" => "Open", "finished" => "Finished" } + scenario "Filters are properly highlighted" do + filters_links = { "all" => "All", "open" => "Open", "finished" => "Finished" } visit admin_budgets_path expect(page).not_to have_link(filters_links.values.first) filters_links.keys.drop(1).each { |filter| expect(page).to have_link(filters_links[filter]) } - filters_links.each_pair do |current_filter, link| + filters_links.each do |current_filter, link| visit admin_budgets_path(filter: current_filter) expect(page).not_to have_link(link)