From d9410a132a901570e6de58467693633f9e656d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 26 Sep 2018 11:28:22 +0200 Subject: [PATCH] Always show filters for legislation proposals As done in the rest of the application: we show the filters even if there isn't any data to display. --- app/controllers/legislation/processes_controller.rb | 2 -- .../legislation/processes/_proposals_content.html.erb | 2 +- spec/features/legislation/proposals_spec.rb | 8 +------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 83976db8c..abe814574 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -95,8 +95,6 @@ class Legislation::ProcessesController < Legislation::BaseController @proposals = @proposals.search(params[:search]) if params[:search].present? @proposals = @proposals.send(@current_filter).order('random()').page(params[:page]) - @valid_filters = [] unless @proposals.selected.any? - if @process.proposals_phase.started? || (current_user && current_user.administrator?) legislation_proposal_votes(@proposals) render :proposals diff --git a/app/views/legislation/processes/_proposals_content.html.erb b/app/views/legislation/processes/_proposals_content.html.erb index cd36125d0..714ed4305 100644 --- a/app/views/legislation/processes/_proposals_content.html.erb +++ b/app/views/legislation/processes/_proposals_content.html.erb @@ -3,12 +3,12 @@
+ <%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.proposals" %> <% if proposals.empty? %>

<%= t("legislation.processes.proposals.empty_proposals") %>

<% else %> - <%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.proposals" %> <%= render proposals %> <%= paginate proposals %> <% end %> diff --git a/spec/features/legislation/proposals_spec.rb b/spec/features/legislation/proposals_spec.rb index b4800528f..d89a381f1 100644 --- a/spec/features/legislation/proposals_spec.rb +++ b/spec/features/legislation/proposals_spec.rb @@ -64,17 +64,11 @@ feature 'Legislation Proposals' do expect(legislation_proposals_order).to eq(first_page_proposals_order) end - scenario 'Selected filter apperars only if exists any selected poposal' do + scenario 'Selected filter apperars even if there are not any selected poposals' do create(:legislation_proposal, legislation_process_id: process.id) visit legislation_process_proposals_path(process) - expect(page).not_to have_content('Selected') - - create(:legislation_proposal, legislation_process_id: process.id, selected: true) - - visit legislation_process_proposals_path(process) - expect(page).to have_content('Selected') end