Merge pull request #1088 from consul/add-all-tab

adds new filter 'All' to admin sps index
This commit is contained in:
Juanjo Bazán
2016-04-26 10:43:07 +02:00
4 changed files with 9 additions and 2 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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