consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds booth_assignment show with officers and recounts info

Browse Source
This commit is contained in:
Juanjo Bazán
2017-01-04 21:00:36 +01:00
parent 2bd6e121c7
commit 70b86170a2
10 changed files with 127 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/admin/poll/booth_assignments_controller.rb
View File

@@ -1,7 +1,5 @@
class Admin::Poll::BoothAssignmentsController < Admin::BaseController
before_action :load_booth_assignment, only: :destroy
def create
@booth_assignment = ::Poll::BoothAssignment.new(poll_id: booth_assignment_params[:poll], booth_id: booth_assignment_params[:booth])
@@ -14,6 +12,8 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
end
def destroy
@booth_assignment = ::Poll::BoothAssignment.find(params[:id])
if @booth_assignment.destroy
notice = t("admin.booth_assignments.flash.destroy")
else
@@ -22,10 +22,15 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
redirect_to admin_poll_path(@booth_assignment.poll_id, anchor: 'tab-booths'), notice: notice
end
def show
@poll = ::Poll.find(params[:poll_id])
@booth_assignment = @poll.booth_assignments.includes(:recounts, officer_assignments: [officer: [:user]]).find(params[:id])
end
private
def load_booth_assignment
@booth_assignment = ::Poll::BoothAssignment.find_by(poll: params[:poll], booth: params[:booth])
@booth_assignment = ::Poll::BoothAssignment.find(params[:id])
end
def booth_assignment_params