From 422f3a5f470c62ff8c1df555c3308993a66aa543 Mon Sep 17 00:00:00 2001 From: voodoorai2000 Date: Sun, 16 Sep 2018 16:26:26 +0200 Subject: [PATCH] Add tag filtering for legislation proposals --- app/controllers/legislation/processes_controller.rb | 5 ++++- spec/factories/legislations.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index a5f1836c2..f30b9d894 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -88,7 +88,10 @@ class Legislation::ProcessesController < Legislation::BaseController def proposals set_process @phase = :proposals_phase - @proposals = ::Legislation::Proposal.where(process: @process).order('random()').page(params[:page]) + + @proposals = ::Legislation::Proposal.where(process: @process) + @proposals = @proposals.search(params[:search]) if params[:search].present? + @proposals = @proposals.order('random()').page(params[:page]) if @process.proposals_phase.started? || (current_user && current_user.administrator?) legislation_proposal_votes(@proposals) diff --git a/spec/factories/legislations.rb b/spec/factories/legislations.rb index 526adc39e..913ab33e8 100644 --- a/spec/factories/legislations.rb +++ b/spec/factories/legislations.rb @@ -152,7 +152,7 @@ LOREM_IPSUM end factory :legislation_proposal, class: 'Legislation::Proposal' do - title "Example proposal for a legislation" + sequence(:title) { |n| "Proposal #{n} for a legislation" } summary "This law should include..." terms_of_service '1' process factory: :legislation_process