adds booth_assignment show with officers and recounts info

2017-01-04 21:00:36 +01:00
parent 2bd6e121c7
commit 70b86170a2
10 changed files with 127 additions and 105 deletions
--- a/app/controllers/admin/poll/polls_controller.rb
+++ b/app/controllers/admin/poll/polls_controller.rb
@@ -6,7 +6,7 @@ class Admin::Poll::PollsController < Admin::BaseController
  end

  def show
-    @poll = Poll.includes(:questions, :booths, officers: [:user]).order('poll_questions.title', 'poll_booths.name', 'users.username').find(params[:id])
+    @poll = Poll.includes(:questions, booth_assignments: [:booth], officers: [:user]).order('poll_questions.title', 'poll_booths.name', 'users.username').find(params[:id])
  end

  def new