From 1c92ac4089d65006878d662623c9364185d37820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 26 Apr 2016 10:20:07 +0200 Subject: [PATCH 1/2] adds new filter 'All' to admin sps index --- app/controllers/admin/spending_proposals_controller.rb | 2 +- config/locales/admin.en.yml | 1 + config/locales/admin.es.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index 9826ab17f..3c7f0c78d 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -2,7 +2,7 @@ class Admin::SpendingProposalsController < Admin::BaseController include FeatureFlags feature_flag :spending_proposals - has_filters %w{valuation_open without_admin managed valuating valuation_finished}, only: :index + has_filters %w{valuation_open without_admin managed valuating valuation_finished all}, only: :index load_and_authorize_resource diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 3a04b8a6a..01b485b5b 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -165,6 +165,7 @@ en: managed: Managed valuating: Under valuation valuation_finished: Valuation finished + all: All title: Investment projects for participatory budgeting assigned_admin: Assigned administrator no_admin_assigned: No admin assigned diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 16dd2373a..10ffdf22d 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -165,6 +165,7 @@ es: managed: Gestionando valuating: En evaluación valuation_finished: Evaluación finalizada + all: Todas title: Propuestas de inversión para presupuestos participativos assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado From d5e3c9ac3c2f3bd9d6df74b8612d2f6d3ae6e0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 26 Apr 2016 10:30:31 +0200 Subject: [PATCH 2/2] adds specs for new filter --- spec/features/admin/spending_proposals_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index a28feded4..118c66d26 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -194,7 +194,8 @@ feature 'Admin spending proposals' do 'without_admin' => 'Without assigned admin', 'managed' => 'Managed', 'valuating' => 'Under valuation', - 'valuation_finished' => 'Valuation finished'} + 'valuation_finished' => 'Valuation finished', + 'all' => 'All'} visit admin_spending_proposals_path @@ -253,6 +254,10 @@ feature 'Admin spending proposals' do expect(page).to_not have_content("Ongoing valuation") expect(page).to have_content("Old idea") + + visit admin_spending_proposals_path(filter: 'all') + expect(page).to have_content("Ongoing valuation") + expect(page).to have_content("Old idea") end scenario "Filtering by tag" do