Merge pull request #1885 from consul/chore/remove_final_recounts

Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
parent 33c687ffec 9c6a974bec
commit 34568567a3
30 changed files with 69 additions and 201 deletions
--- a/app/controllers/admin/poll/officer_assignments_controller.rb
+++ b/app/controllers/admin/poll/officer_assignments_controller.rb
@@ -18,7 +18,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController
    @officer = ::Poll::Officer.includes(:user).find(officer_assignment_params[:officer_id])
    @officer_assignments = ::Poll::OfficerAssignment.
                           joins(:booth_assignment).
-                           includes(:final_recounts, booth_assignment: :booth).
+                           includes(:total_results, booth_assignment: :booth).
                           where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id).
                           order(:date)
  end