From 599ddf8f4162adc253142fa0f1a357b796b34022 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 31 Oct 2017 13:58:19 +0100 Subject: [PATCH] Create @proposal variable con process controller for proposals list that use random seed --- app/controllers/legislation/processes_controller.rb | 3 ++- app/views/legislation/processes/proposals.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 804703381..59fd80e5f 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -89,8 +89,9 @@ class Legislation::ProcessesController < Legislation::BaseController set_process @phase = :proposals_phase + @proposals = Legislation::Proposal.where(process: @process) if @process.proposals_phase.started? - legislation_proposal_votes(@process.proposals) + legislation_proposal_votes(@proposals) render :proposals else render :phase_not_open diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index 6159e9143..29d377484 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -9,12 +9,12 @@
- <% if @process.proposals.empty? %> + <% if @proposals.empty? %>

<%= t('.empty_proposals') %>

<% else %> - <%= render @process.proposals %> + <%= render @proposals %> <% end %>