From 2c3770229852cf0b8c1ff7b0c64ffa68e2f268a2 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Fri, 18 May 2018 14:44:16 -0400 Subject: [PATCH] Sort booths by name and enable pagination --- app/controllers/admin/poll/booth_assignments_controller.rb | 2 +- app/views/admin/poll/booth_assignments/manage.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index c90eb9cac..ea1f2f28f 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -55,7 +55,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController end def manage - @booths = ::Poll::Booth.all + @booths = ::Poll::Booth.all.order(name: :asc).page(params[:page]).per(300) @poll = Poll.find(params[:poll_id]) end diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb index a24fac478..b7d619c71 100644 --- a/app/views/admin/poll/booth_assignments/manage.html.erb +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -25,4 +25,6 @@ <% end %> + + <%= paginate @booths %> <% end %>