From c359b93fd02b1daaa65af0c11a4eaa9500da2d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Tue, 14 Feb 2017 16:01:09 +0100
Subject: [PATCH] fixes booth search in admin

---
 .../admin/poll/booth_assignments_controller.rb     |  4 ++--
 .../_search_booths_results.html.erb                | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
index a6d9eecd0..c261003f3 100644
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -20,7 +20,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
   end
 
   def create
-    @booth_assignment = ::Poll::BoothAssignment.new(poll_id: booth_assignment_params[:poll], booth_id: booth_assignment_params[:booth])
+    @booth_assignment = ::Poll::BoothAssignment.new(poll_id: booth_assignment_params[:poll_id], booth_id: booth_assignment_params[:booth])
 
     if @booth_assignment.save
       notice = t("admin.poll_booth_assignments.flash.create")
@@ -48,7 +48,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
     end
 
     def booth_assignment_params
-      params.permit(:booth, :poll)
+      params.permit(:booth, :poll_id)
     end
 
     def load_poll
diff --git a/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb
index 8f11ff5ae..a27d1ae85 100644
--- a/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb
+++ b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb
@@ -25,16 +25,10 @@
           <%= booth.location %>
         </td>
         <td class="text-center">
-          <% if @poll.booth_ids.include?(booth.id) %>
-            <%= link_to t("admin.poll_booth_assignments.index.remove_booth"),
-                          method: :delete,
-                          class: "button hollow alert" %>
-          <% else %>
-            <%= link_to t("admin.poll_booth_assignments.index.add_booth"),
-                          admin_poll_booth_assignments_path(poll: @poll, booth: booth),
-                          method: :post,
-                          class: "button hollow" %>
-          <% end %>
+          <%= link_to t("admin.poll_booth_assignments.index.add_booth"),
+                        admin_poll_booth_assignments_path(@poll, booth_id: booth.id),
+                        method: :post,
+                        class: "button hollow" %>
         </td>
       </tr>
       <% end %>