diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index abe814574..bde762666 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -1,6 +1,6 @@ class Legislation::ProcessesController < Legislation::BaseController has_filters %w[open next past], only: :index - has_filters %w[all selected], only: :proposals + has_filters %w[random winners], only: :proposals load_and_authorize_resource @@ -93,7 +93,7 @@ class Legislation::ProcessesController < Legislation::BaseController @proposals = ::Legislation::Proposal.where(process: @process) @proposals = @proposals.search(params[:search]) if params[:search].present? - @proposals = @proposals.send(@current_filter).order('random()').page(params[:page]) + @proposals = @proposals.send(@current_filter).page(params[:page]) if @process.proposals_phase.started? || (current_user && current_user.administrator?) legislation_proposal_votes(@proposals) diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 61398f178..43a5cf1e8 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -52,6 +52,8 @@ class Legislation::Proposal < ActiveRecord::Base scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)} scope :selected, -> { where(selected: true) } + scope :random, -> { sort_by_random } + scope :winners, -> { selected.sort_by_confidence_score } def to_param "#{id}-#{title}".parameterize diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 212e3b9ca..ae04ad606 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -53,8 +53,8 @@ en: proposals: empty_proposals: There are no proposals filters: - all: All - selected: Selected + random: All + winners: Selected debate: empty_questions: There aren't any questions participate: Participate in the debate diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index db250f604..d6cb1670c 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -53,8 +53,8 @@ es: proposals: empty_proposals: No hay propuestas filters: - all: Todos - selected: Seleccionados + random: Todas + winners: Seleccionadas debate: empty_questions: No hay preguntas participate: Realiza tus aportaciones al debate previo participando en los siguientes temas.