consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2948 from consul/backport-legislation-proposal-categories

Browse Source 
Add legislation proposal's categories
This commit is contained in:
Javier Martín
2018-10-04 16:22:21 +02:00
committed by GitHub
parent c7a21e546d 422f3a5f47
commit 429fbc5ed5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/legislation/processes_controller.rb
View File

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

2
spec/factories/legislations.rb
View File

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