Merge branch 'master' into 1786-poll_results

2017-10-23 13:43:58 +02:00
parent 96f588566a 8ca4d0fb7f
commit 5a9ee4642e
25 changed files with 341 additions and 153 deletions
--- a/app/models/poll/booth.rb
+++ b/app/models/poll/booth.rb
@@ -15,5 +15,8 @@ class Poll
      where(polls: { id: Poll.current_or_incoming }).includes(:polls)
    end

+    def assignment_on_poll(poll)
+      booth_assignments.where(poll: poll).first
+    end
  end
-end
+end