From 2b68f02b955f4dfded18eabeef02f343526ec436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Tue, 14 Feb 2017 19:09:31 +0100
Subject: [PATCH] paginates booths

---
 app/controllers/admin/poll/booth_assignments_controller.rb | 2 +-
 app/views/admin/poll/booth_assignments/index.html.erb      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
index 926aae786..f81382bf8 100644
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -3,7 +3,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
   before_action :load_poll, except: [:create, :destroy]
 
   def index
-    @booth_assignments = @poll.booth_assignments.includes(:booth)
+    @booth_assignments = @poll.booth_assignments.includes(:booth).order('poll_booths.name').page(params[:page]).per(50)
   end
 
   def search_booths
diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb
index c96f6ba3d..f14e59ef1 100644
--- a/app/views/admin/poll/booth_assignments/index.html.erb
+++ b/app/views/admin/poll/booth_assignments/index.html.erb
@@ -5,7 +5,7 @@
 
   <h3><%= t("admin.poll_booth_assignments.index.booths_title") %></h3>
 
-  <% if @poll.booth_assignments.empty? %>
+  <% if @booth_assignments.empty? %>
     <div class="callout primary margin-top">
       <%= t("admin.poll_booth_assignments.index.no_booths") %>
     </div>
@@ -17,7 +17,7 @@
         <th class="text-right"><%= t("admin.poll_booth_assignments.index.table_assignment") %></th>
       </thead>
       <tbody>
-        <% @poll.booth_assignments.each do |booth_assignment| %>
+        <% @booth_assignments.each do |booth_assignment| %>
           <tr id="<%= dom_id(booth_assignment) %>" class="booth">
             <td>
               <strong>
@@ -37,5 +37,7 @@
         <% end %>
       </tbody>
     </table>
+
+    <%= paginate @booth_assignments %>
   <% end %>
 </div>