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

fixes conflicts with polls

Browse Source
This commit is contained in:
rgarcia
2017-01-29 00:44:56 +01:00
parent 6c34599e1e 8dc188e4cd
commit ea701e9963
10 changed files with 185 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,8 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
def show
@poll = ::Poll.find(params[:poll_id])
@booth_assignment = @poll.booth_assignments.includes(:recounts, officer_assignments: [officer: [:user]]).find(params[:id])
@booth_assignment = @poll.booth_assignments.includes(:recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id])
@voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
end
private

2
app/controllers/officing/polls_controller.rb
View File

@@ -2,7 +2,7 @@ class Officing::PollsController < Officing::BaseController
def index
@polls = current_user.poll_officer? ? current_user.poll_officer.assigned_polls : []
@polls = @polls.select {|poll| poll.current?(1.day.ago)}
@polls = @polls.select {|poll| poll.current?(Time.current) || poll.current?(1.day.ago)}
end
end