From 2886d6d9545806aa6c01229798aba676e5d12d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Tue, 3 Jan 2017 22:20:22 +0100 Subject: [PATCH] adds relations to officer/booth assignments --- app/models/poll/booth_assignment.rb | 1 + app/models/poll/officer_assignment.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/poll/booth_assignment.rb b/app/models/poll/booth_assignment.rb index 3c3d3d0d0..9460533fa 100644 --- a/app/models/poll/booth_assignment.rb +++ b/app/models/poll/booth_assignment.rb @@ -4,6 +4,7 @@ class Poll belongs_to :poll has_many :officer_assignments, class_name: "Poll::OfficerAssignment", dependent: :destroy + has_many :recounts, class_name: "Poll::Recount", dependent: :destroy has_many :officers, through: :officer_assignments has_many :voters end diff --git a/app/models/poll/officer_assignment.rb b/app/models/poll/officer_assignment.rb index 3ef0ee2db..e192780cc 100644 --- a/app/models/poll/officer_assignment.rb +++ b/app/models/poll/officer_assignment.rb @@ -2,6 +2,7 @@ class Poll class OfficerAssignment < ActiveRecord::Base belongs_to :officer belongs_to :booth_assignment + has_one :recount validates :officer_id, presence: true validates :booth_assignment_id, presence: true