Merge branch 'master' into polls_minor_changes

2017-10-03 16:22:33 +02:00
parent 2cb620296b 21e14776fc
commit 05d40c0ede
47 changed files with 559 additions and 173 deletions
--- a/app/controllers/officing/voters_controller.rb
+++ b/app/controllers/officing/voters_controller.rb
@@ -12,7 +12,8 @@ class Officing::VotersController < Officing::BaseController
    @voter = Poll::Voter.new(document_type:   @user.document_type,
                             document_number: @user.document_number,
                             user: @user,
-                             poll: @poll)
+                             poll: @poll,
+                             origin: "booth")
    @voter.save!
  end